会员

src/main/java/io/v/nutz/zhgh/data/constant/UserChangeType.java

@@ -22,9 +22,9 @@ public enum UserChangeType {
     RESIGN(3, "离校"),
     DIE(4, "去世"),
     RETIREMENT(5, "离退休"),
-    //    EXPELLED(6, "开除"),
+    EXPELLED(6, "开除"),
     RESTORE(7, "入会"),
-        WITHDRAWAL(8, "退会"),
+    WITHDRAWAL(8, "退会"),
 //    NONE(9, "不变"),
     BASIC_CHANGE(10, "基本信息异动"),
     WORK(11, "在职"),

src/main/java/io/v/nutz/zhgh/member/controller/MemberCommonController.java

@@ -221,7 +221,7 @@ public class MemberCommonController {
             }
 
             String userState = StrUtil.blankToDefault(changeRecord.getChangeUserState(), "");
-            if (!userState.equals(sysUserMap.getString("userState", ""))) {
+            if (StrUtil.isNotBlank(userState) && !userState.equals(sysUserMap.getString("userState", ""))) {
                 compareData.add(NutMap.NEW()
                         .addv("columnName", "在职状态")
                         .addv("newValue", userState)
@@ -229,6 +229,15 @@ public class MemberCommonController {
                 );
             }
 
+            String personType = StrUtil.blankToDefault(changeRecord.getChangePersonType(), "");
+            if (StrUtil.isNotBlank(personType) && !personType.equals(sysUserMap.getString("personType", ""))) {
+                compareData.add(NutMap.NEW()
+                        .addv("columnName", "人员类型")
+                        .addv("newValue", personType)
+                        .addv("oldValue", sysUserMap.getString("personType"))
+                );
+            }
+
             //在职,退休,离职可能会发生会员和福利会员的变化
             if(changeRecord.getUpdateMember()!=null && changeRecord.getUpdateMember()){
                 //说明要改变会员状态

src/main/java/io/v/nutz/zhgh/member/controller/change/MemberChangeManageController.java

@@ -311,7 +311,11 @@ public class MemberChangeManageController {
             memberChangeRecord = MemberChangeAuditHandle.CREATE.next(memberChangeRecord, null);
             MemberChangeAuditHandle.SCHOOL.next(memberChangeRecord, audit);
         } else {
-            memberChangeRecord.setApplyOrigin(MemberChangeOrigin.UNION.getCode());
+            if (ShiroUtil.hasAnyRoles("gh01, H04")) {
+                memberChangeRecord.setApplyOrigin(MemberChangeOrigin.UNION.getCode());
+            } else if (ShiroUtil.hasRole("ghxzzz")){
+                memberChangeRecord.setApplyOrigin(MemberChangeOrigin.UNION_GROUP.getCode());
+            }
             memberChangeRecord = MemberChangeAuditHandle.CREATE.next(memberChangeRecord, null);
             MemberChangeAuditHandle.UNION.next(memberChangeRecord, audit);
         }
@@ -546,6 +550,9 @@ public class MemberChangeManageController {
     public Object units() {
         Cnd cnd = Cnd.NEW();
         cnd.and("unitlevel", "=", 2);
+        if (!ShiroUtil.hasAnyRoles("sysadmin,SchoolUnionAdmin")) {
+            cnd.and("id", "!=", "DZJF000");
+        }
         return sysUnitService.dao().query("unit_union", cnd);
     }
 

src/main/java/io/v/nutz/zhgh/welfare/service/impl/WelfareSingleServiceImpl.java

@@ -181,9 +181,10 @@ public class WelfareSingleServiceImpl extends ViServiceImpl<WelfareProject> impl
                 	wpus.receiveAddress,
                 	wpus.welfareId,
                 	wpus.selectUserId,
-                	wl.welfareUnitId as unionId
+                	IF(staff.unionRelationUnionId is not null, staff.unionRelationUnionId, wl.welfareUnitId) AS unionId
                 FROM
                 	`welfare_project_user_selection` wpus
+                	LEFT JOIN special_staff staff ON staff.userId = wpus.selectUserId
                 	LEFT JOIN welfare_list wl on wl.userId = wpus.selectUserId AND wpus.welfareId = wl.projectId
                 $condition
                 """);