优化代码

diagbotman-service/src/main/java/com/diagbot/facade/UserRenewalsFacade.java

@@ -18,6 +18,8 @@ import com.diagbot.idc.VisibleIdCreater;
 import com.diagbot.service.impl.UserRenewalsServiceImpl;
 import com.diagbot.util.BeanUtil;
 import com.diagbot.util.DateUtil;
+import com.diagbot.util.EntityUtil;
+import com.diagbot.util.StringUtil;
 import com.diagbot.util.UserUtils;
 import com.diagbot.vo.AddRenewalsInfoVO;
 import com.diagbot.vo.DeleteRenewalsInfoVO;
@@ -76,12 +78,13 @@ public class UserRenewalsFacade extends UserRenewalsServiceImpl {
         UserRenewalsWrapper userRenewalsWrapper =new UserRenewalsWrapper();
         BeanUtil.copyProperties(renewalsInfosVO,userRenewalsWrapper);
         userRenewalsWrapper.setCancelRenewals(CancelRenewalsEnum.NOT_CANCEL.getKey());
-        if(renewalsInfosVO.getOrgName()!=null && renewalsInfosVO.getOrgName()!=""){
+        if(StringUtil.isNotBlank(renewalsInfosVO.getOrgName())){
             RespDTO<List<Long>> rlist = userServiceClient.getUserByOrgName(renewalsInfosVO.getOrgName());
             userRenewalsWrapper.setUserId(rlist.data);
         }
         List<RenewalsInfosDTO> list = this.selectUserRenewals(page,userRenewalsWrapper).getRecords();
         List<ProductLineDTO> productList =lantoneProductFacade.productLines();
+        Map<Long, ProductLineDTO> productMap = EntityUtil.makeEntityMap(productList,"id");
         List<Long> userIds =new ArrayList<>();
         for (RenewalsInfosDTO renewalsInfosDTO:list) {
             Long userId = renewalsInfosDTO.getUserId();
@@ -96,10 +99,13 @@ public class UserRenewalsFacade extends UserRenewalsServiceImpl {
         for(RenewalsInfosDTO bean : list) {
             UserOrgDTO uo = dataMap.get(bean.getUserId());
             bean.setRenewalsStatusName(RenewalsEnum.getName(bean.getRenewalsStatus()));
-            for (ProductLineDTO productLineDTO:productList) {
-                if (productLineDTO.getId()==bean.getProductId()){
-                    bean.setProductName(productLineDTO.getName());
-                }
+//            for (ProductLineDTO productLineDTO:productList) {
+//                if (productLineDTO.getId()==bean.getProductId()){
+//                    bean.setProductName(productLineDTO.getName());
+//                }
+//            }
+            if (null != productMap && null != productMap.get(bean.getProductId())){
+                bean.setProductName(productMap.get(bean.getProductId()).getName());
             }
             if(uo != null) {
                 bean.setUsername(uo.getUsername());

user-service/src/main/java/com/diagbot/dto/UserAuthenticationDTO.java

@@ -1,11 +1,5 @@
 package com.diagbot.dto;
 
-import com.diagbot.entity.Organization;
-import com.diagbot.entity.User;
-import com.diagbot.entity.UserAuthentication;
-
-import java.util.Map;
-
 import lombok.Getter;
 import lombok.Setter;