# Conflicts:

#	suishenbang-admin/src/main/java/com/dgtly/web/controller/system/SysUserController.java
#	suishenbang-sync/suishenbang-sync-common/src/main/java/com/dgtly/sync/service/AnalysisDiyCustomerComponent.java

suishenbang-admin/src/main/java/com/dgtly/web/controller/system/SysUserController.java

@@ -144,10 +144,9 @@ public class SysUserController extends BaseController
      * @return
      */
     @GetMapping("/getManagerList")
-    public AjaxResult getManagerList(@RequestParam(value = "depCode" , required = false) String depCode , @RequestParam(value = "userNo", required = false) String userNo)
+    public String getManagerList(@RequestParam(value = "depCode" , required = false) String depCode , @RequestParam(value = "userNo", required = false) String userNo)
     {
-        String rusult = analysisDiyCustomerComponent.getManagerList(depCode,userNo);
-        return new  AjaxResult(00000, rusult);
+        return analysisDiyCustomerComponent.getManagerList(depCode,userNo);
     }
 
     /**

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

@@ -17,7 +17,6 @@ import com.dgtly.sync.mapper.SyncFailDetailMapper;
 import com.dgtly.sync.utils.CustomerAccessTokenUtil;
 import com.dgtly.sync.utils.CustomerAccessTokenUtil.UrlType;
 import com.dgtly.system.domain.AssRelcustomerinfo;
-import com.dgtly.system.domain.SysDictData;
 import com.dgtly.system.domain.SysUser;
 import com.dgtly.system.domain.SysUserExt;
 import com.dgtly.system.mapper.SysUserExtMapper;
@@ -25,13 +24,11 @@ import com.dgtly.system.mapper.SysUserMapper;
 import com.dgtly.system.mapper.SysUserShopExtMapper;
 import com.dgtly.system.service.IAssRelcustomerinfoService;
 import com.dgtly.system.service.ISysConfigService;
-import com.dgtly.system.service.ISysDictDataService;
 import com.dgtly.system.service.impl.SysUserServiceImpl;
 import com.dgtly.wxportal.mapper.WxQyUserMapper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -46,8 +43,7 @@ public class AnalysisDiyCustomerComponent {
 
     @Autowired
     private CustomerAccessTokenUtil customerAccessTokenUtil;
-    @Autowired
-    private ISysDictDataService sysDictDataService;
+
     @Autowired
     private CustomersMapper customersMapper;
     @Autowired
@@ -70,8 +66,6 @@ public class AnalysisDiyCustomerComponent {
 
     @Autowired
     private SysUserShopExtMapper userShopExtMapper;
-    @Autowired
-    JdbcTemplate jdbcTemplate;
     private Long deptId;
     //老板角色
     private Long[] roleIds;
@@ -155,7 +149,6 @@ public class AnalysisDiyCustomerComponent {
             if (code == 0) {
                 MSQ.addAll(msqjson.getJSONArray("data"));
                 success += buildSysUser(MSQ, loginNameSet, diyNameSet, 4, failDetails, packageId, chainsMap);
-
                 total += MSQ.size();
             }
         }
@@ -704,10 +697,12 @@ public class AnalysisDiyCustomerComponent {
                 if(dataArray.size() >0){
                     String packageId = "diycustomer"+new Date().getTime();
                     buildSysUser(dataArray, null, null, 1, failDetails, packageId, chainsMap);
+                    return "拉取成功";
+                }else {
+                    return "拉取成功,数据为空";
                 }
-                return "拉取成功";
             }else {
-                return "获取数据为空";
+                return "获取数据失败";
             }
         } catch (Exception e) {
             customerAccessTokenUtil.reSetToken();
@@ -716,6 +711,21 @@ public class AnalysisDiyCustomerComponent {
         }
     }
 
+    public static void main(String[] args) {
+        String t1= "{\"msg\":\"SUCCESS\",\"code\":0,\"data\":[],\"count\":0,\"page\":1,\"request_id\":\"85e48d75-c826-4dc2-a17d-531387eaa3f0\",\"page_size\":100}";
+        JSONObject managerListJson = JSONObject.parseObject(t1);
+        int code = managerListJson.getInteger("code");
+        if (code == 0) {
+            JSONArray dataArray = managerListJson.getJSONArray("data");
+            if(dataArray.size() >0){
+                String packageId = "diycustomer"+new Date().getTime();
+           //     buildSysUser(dataArray, null, null, 1, failDetails, packageId, chainsMap);
+            }
+
+        }else {
+        }
+    }
+
     /*
      * @description: 厨卫人员拉取
      * @author: qxm
@@ -985,23 +995,8 @@ public class AnalysisDiyCustomerComponent {
                 *//*人员信息是否已更新入企业微信。true：更新成功false：更新失败*//*
                 if(!isSync){
                     continue;
-                }*/
-                //如果人员来自字典配置并且信息是删除状态的话   需要删除  cust_exclusion_info表中 按照类型和登录名称进行删除
-                Set<String> res = new HashSet<>();
-                List<SysDictData> dictDatas = sysDictDataService.selectSimpleDictDataByType("customer_user_is_customer_manager");
-                for(SysDictData d: dictDatas){
-                    res.add(d.getDictValue());
-                }
-                if(res.contains(String.valueOf(isManager))){
-                    if(isDelete){
-                        //需要去删除排除表中的数据  按照用户类型和登录名称
-                        jdbcTemplate.update("delete from cust_exclusion_info where loginName=? and type=?  ",userid,isManager);
-                    }
                 }
-
-
-
-                /*人员信息是否被标记删除true：删除，false：未删除*/
+                *//*人员信息是否被标记删除true：删除，false：未删除*/
                 if(isDelete){
                     continue;
                 }
@@ -1081,35 +1076,6 @@ public class AnalysisDiyCustomerComponent {
                     //查询岗位现阶段存在的用户
                     SysUser userOld = sysUserService.selectUserByLoginName(userid);
                     SysUser user = sysUserService.selectUserByLoginName(userid);
-                    //将用户扩展表的信息给加上
-                    if(StringUtils.isBlank(user.getSysUserExt().getSalesLevel())){
-                        log.info("进行用户扩展表信息补偿：--------userId:"+user.getSysUserExt().getUserId().toString());
-                        SysUserExt userExt = new SysUserExt();
-                        userExt.setSalesLevel("customer_level");
-                        userExt.setIsCustomerManager(isManager + "");
-                        userExt.setSapEmployeeId(userNo);
-                        userExt.setIdentity(UserIdentityUtil.UI_DIY);
-                        userExt.setPostName("DIY经销商");
-                        String orgCode = jo.getString("depCode");
-                        String code = null;
-                        if (cusMap.containsKey(orgCode)) {
-                            Customers c = cusMap.get(orgCode);
-                            userExt.setOrgCode(c.getChainsCode());
-                            userExt.setOrgName(c.getChainsName());
-                            code = c.getChainsCode();
-                        } else {
-                            userExt.setOrgCode(orgCode);
-                            userExt.setOrgName(customerName);
-                        }
-                        if (isManager == 0) {
-                            userExt.setCustomerCode(userExt.getOrgCode());
-                        } else {
-                            userExt.setCustomerCode(jo.getString("depCode"));
-                        }
-                        sysUserExtMapper.insertOrUpSysUserExt(userExt);
-                        user.setSysUserExt(userExt);
-                        userOld.setSysUserExt(userExt);
-                    }
                     if (("0").equals(user.getIsSync())) {
                         //查询该用户是否存在该接口返回中
                         user.setPhonenumber(jo.getString("mobile"));
@@ -1242,22 +1208,6 @@ public class AnalysisDiyCustomerComponent {
                         }
                     }
                 }
-
-                if(res.contains(String.valueOf(isManager))){
-                    //查找用户userid
-                    List<Map<String,Object>> userInfo=jdbcTemplate.queryForList("select user_id from  sys_user where login_name=? and del_flag='0' and quit is null",userid);
-                    //在这里进行插入排除用户的操作
-                    if(userInfo.size()!=0){
-                        List<Map<String,Object>> insertOrno=jdbcTemplate.queryForList("select userId from  cust_exclusion_info where userId=? and type=? and customerCode =?",userInfo.get(0).get("user_id"),isManager,customerCode);
-                        if(insertOrno.size()==0){
-                            jdbcTemplate.update("insert into  cust_exclusion_info (loginName,customerCode,type,userId) values (?,?,?,?)",userid,customerCode,isManager,userInfo.get(0).get("user_id"));
-                        }
-                    }
-                }
-
-
-
-
             } catch (Exception e) {
                 log.error(e.getMessage());
                 e.printStackTrace();