人员同步优化

cx-question/cx-question-common/src/main/java/com/rongwei/bscommon/sys/dao/CxCommonDao.java

@@ -9,7 +9,7 @@ public interface CxCommonDao {
     @Update("delete from sys_organization")
     void deleteAllOrg();
 
-    @Update("delete from sys_user")
+    @Update("delete from sys_user where deleted='1'")
     void deleteAllUser();
 
     @Update("delete from sys_user_org")

cx-question/cx-question-common/src/main/java/com/rongwei/bscommon/sys/service/impl/OrgUserSyncServiceImpl.java

@@ -226,6 +226,8 @@ public class OrgUserSyncServiceImpl implements OrgUserSyncService {
                 }
             }
         }
+        // 先清除用户表删除状态的数据（deleted为1的数据）
+        commonDao.deleteAllUser();
         // 数据保存
         this.userSave(userDos,userOrgDos);
     }
@@ -239,8 +241,6 @@ public class OrgUserSyncServiceImpl implements OrgUserSyncService {
     public void userSave(List<SysUserDo> userDos,List<SysUserOrgDo> userOrgDos){
         // 用户表和用户部门表数据保存
         if(userDos != null && userDos.size()>0){
-            // 先清除用户表
-//            commonDao.deleteAllUser();
             sysUserService.saveOrUpdateBatch(userDos);
             if(userOrgDos != null && userOrgDos.size()>0){
                 // 先清除用户部门表