Merge remote-tracking branch 'origin/dev/icssNCD' into dev/icssNCD

docs/006.20190304慢病基于icss增量脚本/init_icss_NCD.sql

@@ -268,5 +268,5 @@ UPDATE `icss_module_info` SET `module_type`='0',`relation_id`='0' WHERE (`id`='1
 UPDATE `icss_module_info` SET `module_type`='0',`relation_id`='0' WHERE (`id`='2');
 UPDATE `icss_module_info` SET `type` = '32',`module_type`='0',`relation_id`='0' WHERE (`id`='3');
 UPDATE `icss_module_info` SET `module_type`='0',`relation_id`='0' WHERE (`id`='4');
-UPDATE `icss_module_info` SET `module_type`='0',`relation_id`='0' WHERE (`id`='5');
-UPDATE `icss_module_info` SET `type` = '31',`module_type`='0',`relation_id`='0' WHERE (`id`='6');
+UPDATE `icss_module_info` SET `type` = '22',`module_type`='0',`relation_id`='0' WHERE (`id`='5');
+UPDATE `icss_module_info` SET `type` = '31',`module_type`='0',`relation_id`='0' WHERE (`id`='6');

icssman-service/src/main/java/com/diagbot/facade/QuestionUsualFacade.java

@@ -161,15 +161,17 @@ public class QuestionUsualFacade extends QuestionUsualServiceImpl {
         for (GetDeptInfoDTO getDeptInfoDTO : iPage.getRecords()) {
             ids.add(getDeptInfoDTO.getModifier());
         }
-        RespDTO<Map<String, String>> respDTO = userServiceClient.getUserInfoByIds(ids);
-        if (respDTO == null || !CommonErrorCode.OK.getCode().equals(respDTO.code)) {
-            throw new CommonException(CommonErrorCode.RPC_ERROR,
-                    "获取用户信息失败");
-        }
-        //将用户信息放入实体
-        for (GetDeptInfoDTO getDeptInfoDTO : iPage.getRecords()) {
-            getDeptInfoDTO.setUserName(respDTO.data.get(getDeptInfoDTO.getModifier()));
-            getDeptInfoDTO.setTypeName(QuestionTypeEnum.getName(getDeptInfoDTO.getType()));
+        if(ListUtil.isNotEmpty(ids)){
+            RespDTO<Map<String, String>> respDTO = userServiceClient.getUserInfoByIds(ids);
+            if (respDTO == null || !CommonErrorCode.OK.getCode().equals(respDTO.code)) {
+                throw new CommonException(CommonErrorCode.RPC_ERROR,
+                        "获取用户信息失败");
+            }
+            //将用户信息放入实体
+            for (GetDeptInfoDTO getDeptInfoDTO : iPage.getRecords()) {
+                getDeptInfoDTO.setUserName(respDTO.data.get(getDeptInfoDTO.getModifier()));
+                getDeptInfoDTO.setTypeName(QuestionTypeEnum.getName(getDeptInfoDTO.getType()));
+            }
         }
         return iPage;
     }