激活状态修改

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/MessageApiServiceImpl.java

@@ -243,15 +243,6 @@ public class MessageApiServiceImpl implements MessageApiService {
             if(qywxCallBackDTO.getStatus() != null && qywxCallBackDTO.getStatus() == 1){
             	staff.setActiveFlag(1);
             }
-            Integer status = qywxCallBackDTO.getStatus();
-            if(status != null && status == 1){
-            	staff.setActiveFlag(1);
-            }
-            if(qywxCallBackDTO.getStatus() != null && qywxCallBackDTO.getStatus() == 1){
-                staff.setActiveFlag(1);
-            } else {
-                staff.setActiveFlag(0);
-            }
             if(qywxCallBackDTO.getChangeType().equals(WxEditType.ADDUSER.getCode())){
                 this.addUser(qywxCallBackDTO, staff);
             } else if(qywxCallBackDTO.getChangeType().equals(WxEditType.UPDATEUSER.getCode())){
@@ -275,6 +266,9 @@ public class MessageApiServiceImpl implements MessageApiService {
                     if(staff.getSex() == null){
                     	staff.setSex(oldStaff.getSex());
                     }
+                    if(staff.getActiveFlag() == null){
+                    	staff.setActiveFlag(oldStaff.getActiveFlag());
+                    }
 //                    this.staffService.updateByPrimaryKey(staff);
 //                    this.staffDepartmentRelatedService.delByUserid(qywxCallBackDTO.getUserid());
 //                    this.addUserDepart(qywxCallBackDTO, oldStaff.getStaffId(), enterprise.getWxEnterpriseId());