问题代码修复

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/service/impl/MceContentServiceImpl.java

@@ -59,15 +59,6 @@ public class MceContentServiceImpl extends AbstractCrudService<MceContentMapper,
             if (mceReceiveVO.containsKey("infoTypeName")) {
                 sendWeChatMessageRequestVO.setInfoTypeName(mceReceiveVO.get("infoTypeName").toString());
             }
-            if (mceReceiveVO.containsKey("processName")){
-                sendWeChatMessageRequestVO.setProcessName(mceReceiveVO.get("processName").toString());
-            }
-            if (mceReceiveVO.containsKey("approvalNode")){
-                sendWeChatMessageRequestVO.setApprovalNode(mceReceiveVO.get("approvalNode").toString());
-            }
-            if (mceReceiveVO.containsKey("realName")){
-                sendWeChatMessageRequestVO.setRealName(mceReceiveVO.get("realName").toString());
-            }
             mceMbuserService.sendWeChatMessage(sendWeChatMessageRequestVO);
         }
     }
@@ -92,12 +83,33 @@ public class MceContentServiceImpl extends AbstractCrudService<MceContentMapper,
             sendWeChatMessageRequestVO.setInfoId(mceReceiveId);
             sendWeChatMessageRequestVO.setOpenId(cids);
             sendWeChatMessageRequestVO.setInfoType(mceReceiveVO.getInfoType());
-            sendWeChatMessageRequestVO.setInfoTypeName(mceReceiveVO.getInfoTypeName());
-            sendWeChatMessageRequestVO.setIpAddress(mceReceiveVO.getIpAddress());
-            sendWeChatMessageRequestVO.setUserName(mceReceiveVO.getUserName());
-            sendWeChatMessageRequestVO.setLoginAddress(mceReceiveVO.getLoginAddress());
-            sendWeChatMessageRequestVO.setLoginType(mceReceiveVO.getLoginType());
-            sendWeChatMessageRequestVO.setApprovalResult(mceReceiveVO.getApprovalResult());
+            if (StringUtils.isNotEmpty(mceReceiveVO.getInfoTypeName())) {
+                sendWeChatMessageRequestVO.setInfoTypeName(mceReceiveVO.getInfoTypeName());
+            }
+            if (StringUtils.isNotEmpty(mceReceiveVO.getIpAddress())) {
+                sendWeChatMessageRequestVO.setIpAddress(mceReceiveVO.getIpAddress());
+            }
+            if (StringUtils.isNotEmpty(mceReceiveVO.getUserName())) {
+                sendWeChatMessageRequestVO.setUserName(mceReceiveVO.getUserName());
+            }
+            if (StringUtils.isNotEmpty(mceReceiveVO.getLoginAddress())) {
+                sendWeChatMessageRequestVO.setLoginAddress(mceReceiveVO.getLoginAddress());
+            }
+            if (StringUtils.isNotEmpty(mceReceiveVO.getLoginType())) {
+                sendWeChatMessageRequestVO.setLoginType(mceReceiveVO.getLoginType());
+            }
+            if (StringUtils.isNotEmpty(mceReceiveVO.getApprovalResult())) {
+                sendWeChatMessageRequestVO.setApprovalResult(mceReceiveVO.getApprovalResult());
+            }
+            if (StringUtils.isNotEmpty(mceReceiveVO.getProcessName())) {
+                sendWeChatMessageRequestVO.setProcessName(mceReceiveVO.getProcessName());
+            }
+            if (StringUtils.isNotEmpty(mceReceiveVO.getApprovalNode())) {
+                sendWeChatMessageRequestVO.setApprovalNode(mceReceiveVO.getApprovalNode());
+            }
+            if (StringUtils.isNotEmpty(mceReceiveVO.getRealName())) {
+                sendWeChatMessageRequestVO.setRealName(mceReceiveVO.getRealName());
+            }
             mceMbuserService.sendWeChatMessage(sendWeChatMessageRequestVO);
         }
     }