党支部不为空

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/DataReportingServiceImpl.java

@@ -386,7 +386,6 @@ public class DataReportingServiceImpl implements DataReportingService {
 			case ProjectConstant.PENDING:
 				return "01";
 			case ProjectConstant.CLOSED:
-				return "02";
 			case ProjectConstant.CLOSED_CASE:
 				return "03";
 			default:

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java

@@ -524,8 +524,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
                 resiUserId = map.get("ID");
                 //2022.05.18 start zhaoqf 党员信息同步
                 IcResiUserEntity icResiUser = baseDao.selectById(resiUserId);
-                if ((map.containsKey("IS_PARTY") && NumConstant.ONE_STR.equals(map.get("IS_PARTY"))) ||
-                        (!map.containsKey("IS_PARTY") && NumConstant.ONE_STR.equals(icResiUser.getIsParty()))) {
+                if ((map.containsKey("IS_PARTY") && NumConstant.ONE_STR.equals(map.get("IS_PARTY")))) {
                     if (formMap.containsKey("ic_party_member")) {
                         for (LinkedHashMap<String, String> hash : formMap.get("ic_party_member")) {
                             if (!hash.containsKey("ID") && !hash.containsKey("SSZB")) {
@@ -537,6 +536,15 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
                         String errorMsg = "党员信息所属支部不能为空";
                         throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), errorMsg, errorMsg);
                     }
+                } else if (!map.containsKey("IS_PARTY") && NumConstant.ONE_STR.equals(icResiUser.getIsParty())) {
+                    if (formMap.containsKey("ic_party_member")) {
+                        for (LinkedHashMap<String, String> hash : formMap.get("ic_party_member")) {
+                            if (!hash.containsKey("ID") && !hash.containsKey("SSZB")) {
+                                String errorMsg = "党员信息所属支部不能为空";
+                                throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), errorMsg, errorMsg);
+                            }
+                        }
+                    }
                 }
                 if ((map.containsKey("IS_PARTY") && NumConstant.ONE_STR.equals(map.get("IS_PARTY")))
                         || (!map.containsKey("IS_PARTY") && NumConstant.ONE_STR.equals(icResiUser.getIsParty()))) {