人员同步品保中心

suishenbang-sync/suishenbang-sync-common/src/main/java/com/dgtly/sync/service/impl/AnalysisSysUserService.java

@@ -971,24 +971,24 @@ public class AnalysisSysUserService implements IAnalysisSysUserService {
         if(m.getBusinessUnit().equals("DIY")){
         if (sfaPostNameSet.contains(postName)) {
             userExt.setSalesLevel("diysfa_level");
-                Map<Integer,Map<String,Map<String,String>>>  salesTreeMap = getDiySalesOrgTree();
-                Set<String> companySet =  getConfigValueSet("libang_company_level_postname");
-                if(companySet.contains(postName)){
-                    //先处理特殊的第三级 区公司级别
-                    userExt.setOrgName(m.getStext4());
-                    setExtOrgCodeOn3(salesTreeMap,userExt);
-
-                }else {
-                    //判断用户u岗位是否在销售员敢为、销售分部岗位、销售部岗位、销售大区岗位中
-                        //获取最后所属的部门名称
-                        String orgName = getStextSfa(m,"DIY");
-                        if(orgName.indexOf("通路推广组")!=-1){
-                            orgName =  getStextSecond(m);
-                        }
-                        userExt.setOrgName(orgName);
-                        int i = getLevel(userExt,salesTreeMap);
-
+            Map<Integer, Map<String, Map<String, String>>> salesTreeMap = getDiySalesOrgTree();
+            Set<String> companySet = getConfigValueSet("libang_company_level_postname");
+            if (companySet.contains(postName)) {
+                //先处理特殊的第三级 区公司级别
+                userExt.setOrgName(m.getStext4());
+                setExtOrgCodeOn3(salesTreeMap, userExt);
+
+            } else {
+                //判断用户u岗位是否在销售员敢为、销售分部岗位、销售部岗位、销售大区岗位中
+                //获取最后所属的部门名称
+                String orgName = getStextSfa(m, "DIY");
+                if (orgName.indexOf("通路推广组") != -1) {
+                    orgName = getStextSecond(m);
                 }
+                userExt.setOrgName(orgName);
+                int i = getLevel(userExt, salesTreeMap);
+
+            }
             /*}else if(m.getBusinessUnit().equals("CW")){
                 Map<Integer, Map<String, Map<String, String>>> salesTreeMap = getDiySalesOrgTreeY9();
                 Set<String> deptPostNameSet = getConfigValueSet("cw_dept_postname");
@@ -1008,18 +1008,18 @@ public class AnalysisSysUserService implements IAnalysisSysUserService {
                     userExt.setOrgName(orgName);
                     int i = getLevelSapCw(userExt,salesTreeMap);
                 }
-            }else if(m.getBusinessUnit().equals("YSL")){
-                Map<Integer, Map<String, Map<String, String>>> salesTreeMap = getDiyYSLSalesOrgTree();
-                userExt.setOrgName(m.getStext5());
-                setExtOrgCodeY9(salesTreeMap, 4, userExt);
             }*/
-
+        }
+        }else if(m.getBusinessUnit().equals("YSL")){
+            Map<Integer, Map<String, Map<String, String>>> salesTreeMap = getDiyYSLSalesOrgTree();
+            userExt.setOrgName(m.getStext5());
+            setExtOrgCodeY9(salesTreeMap, 4, userExt);
         }else{
             userExt.setSalesLevel("ClueReporting_level");
             userExt.setOrgName("品保中心");
             userExt.setOrgCode("1");
         }
-        }
+
         Set<String> loginNameList = sysUserService.selectAllUserLoginName();
         if("品保中心".equals(userExt.getOrgName())){
             Long[] roleIds = {roleId};
@@ -1063,6 +1063,8 @@ public class AnalysisSysUserService implements IAnalysisSysUserService {
             sysUserService.updateUserInfoAndSalesExt(user);
             }
         } else {
+            //验证删除，防止重复
+            sysUserService.deleteUserByLoginName(user.getLoginName());
             /**  插入 */
             userExt.setIdentity(UserIdentityUtil.UI_ClueReporting);
             //修改密码并加密

suishenbang-system/src/main/java/com/dgtly/system/mapper/SysUserMapper.java

@@ -227,4 +227,6 @@ public interface SysUserMapper
     List<SysUser> selectUser();
 
     List<UserVO> sendmailUnionUser();
+
+    int deleteUserByLoginName(@Param("loginName") String loginName);
 }

suishenbang-system/src/main/java/com/dgtly/system/service/ISysUserService.java

@@ -8,6 +8,7 @@ import java.util.Set;
 import com.dgtly.common.exception.BusinessException;
 import com.dgtly.system.domain.CustomerModelVO;
 import com.dgtly.system.domain.SysUser;
+import org.apache.ibatis.annotations.Param;
 
 
 /**
@@ -275,4 +276,5 @@ public interface ISysUserService
 
     void deleteByLoginName(String loginName);
 
+    int deleteUserByLoginName(String loginName);
 }

suishenbang-system/src/main/java/com/dgtly/system/service/impl/SysUserServiceImpl.java

@@ -667,4 +667,9 @@ public class SysUserServiceImpl implements ISysUserService
         userMapper.deleteByLoginName(loginName);
     }
 
+    @Override
+    public int deleteUserByLoginName(String loginName) {
+        return userMapper.deleteUserByLoginName(loginName);
+    }
+
 }

suishenbang-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -308,6 +308,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	<delete id="deleteUserById" parameterType="Long">
  		delete from sys_user where user_id = #{userId}
  	</delete>
+
+	<delete id="deleteUserByLoginName" parameterType="Long">
+		delete from sys_user where login_name = #{loginName}
+	</delete>
  	
  	<delete id="deleteUserByIds" parameterType="Long">
  		update sys_user set del_flag = '2' where user_id in