Merge remote-tracking branch 'origin/dev_bugfix' into dev_bugfix

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java

@@ -826,12 +826,12 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 					msgList.add(msgObj);
 				}
 				Result result = epmetMessageFeignClient.saveUserMessageList(msgList);
-				if(!result.success()){
+				if(result.success()){
-					logger.warn(String.format(ModuleConstant.FAILED_SEND_MESSAGE,msg));
+                    return;
 				}
 			}
 		}
-
+         logger.warn(String.format(ModuleConstant.FAILED_SEND_MESSAGE,msg));
 
 	}
 }

epmet-user/epmet-user-server/src/main/resources/mapper/StaffRoleDao.xml

@@ -89,7 +89,7 @@
                     GOV_STAFF_ROLE
                 WHERE
                     ROLE_KEY IN
-                        <foreach item="roleKey" collection="rolekeys" open="(" separator="," close=")">
+                        <foreach item="roleKey" collection="roleKeys" open="(" separator="," close=")">
                         #{rolekey}
                         </foreach>
                     AND DEL_FLAG = '0' )