qxm-立邦企业微信接口拉取DIY人员修改为userid登录

suishenbang-admin/src/main/resources/templates/system/user/edit.html

@@ -207,8 +207,9 @@
                             <input class="form-control" type="text" readonly="true" th:field="*{sysUserExt.isCustomerManager}" />
                         </div>-->
                         <label class="col-sm-4 control-label">经销商职位：</label>
-                        <!--<div class="col-sm-8">
-                            <div th:if="${user.sysUserExt.isCustomerManager eq '0'}">
+                        <div class="col-sm-8">
+                            <input class="form-control" id="customerManagerValue" type="text" readonly="true" />
+                            <!--<div th:if="${user.sysUserExt.isCustomerManager eq '0'}">
                                 <input class="form-control" type="text" readonly="true" value="导购" />
                             </div>
                             <div th:if="${user.sysUserExt.isCustomerManager eq '1'}">
@@ -219,9 +220,9 @@
                             </div>
                             <div th:if="${user.sysUserExt.isCustomerManager eq '3'}">
                                 <input class="form-control" type="text" readonly="true" value="仓管" />
-                            </div>
-                        </div>-->
-                        <div class="col-sm-8" th:switch="${user.sysUserExt.isCustomerManager}">
+                            </div>-->
+                        </div>
+                        <!--<div class="col-sm-8" th:switch="${user.sysUserExt.isCustomerManager}">
                             <div th:case="0">
                                 <input class="form-control" type="text" readonly="true" value="导购" />
                             </div>
@@ -234,7 +235,7 @@
                             <div th:case="3">
                                 <input class="form-control" type="text" readonly="true" value="仓管" />
                             </div>
-                        </div>
+                        </div>-->
                     </div>
                 </div>
             </div>
@@ -262,6 +263,20 @@
 	<script th:inline="javascript">
         var prefix = ctx + "system/user";
         var salesLevelDict = [[${@dict.getType('sales_level')}]];//销售人员等级
+        var post = [[${user.sysUserExt.isCustomerManager}]];
+        var postValue = "";
+
+        if (post.indexOf('1') != -1){
+            postValue += "经理 ";
+        }
+        if(post.indexOf('2') != -1){
+            postValue += " 财务 ";
+        }
+        if(post.indexOf('3') != -1){
+            postValue += " 仓管";
+        }
+        $("#customerManagerValue").val(postValue);
+
         $("#form-user-edit").validate({
         	onkeyup: false,
         	rules:{

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

@@ -227,16 +227,37 @@ public class AnalysisDiyCustomerComponent {
 
             try {
                 String userNo = jo.getString("userNo");
-                if(userNo==null||userNo.trim().equals("")){
+                String enable = jo.getString("enable");
+                String status = jo.getString("status");
+                Boolean isSync = jo.getBoolean("isSync");
+                Boolean isDelete = jo.getBoolean("isDelete");
+                String userid = jo.getString("userid");
+                /*企业微信中成员启用状态。1表示启用的成员，0表示被禁用*/
+                /*if(enable==null||enable.trim().equals("0")){
                     continue;
                 }
-                if (!loginNameSet.contains(userNo)) {
+                *//*企业微信中人员激活状态: 1=已激活，2=已禁用，4=未激活，5=退出企业。*//*
+                if(status==null || !status.trim().equals("1")){
+                    continue;
+                }
+                *//*人员信息是否已更新入企业微信。true：更新成功false：更新失败*//*
+                if(!isSync){
+                    continue;
+                }
+                *//*人员信息是否被标记删除true：删除，false：未删除*//*
+                if(isDelete){
+                    continue;
+                }*/
+                if(userid==null||userid.trim().equals("")){
+                    continue;
+                }
+                if (!loginNameSet.contains(userid)) {
 
                     /** =============用户基本信息构建 start===============*/
                     SysUser user = new SysUser();
                     user.setCompanyId(1L);
                     user.setDeptId(deptId);
-                    user.setLoginName(userNo);
+                    user.setLoginName(userid);
                     user.setUserName(jo.getString("name"));
                     user.setPhonenumber(jo.getString("mobile"));
                     user.setRoleIds(roleIds);
@@ -272,7 +293,15 @@ public class AnalysisDiyCustomerComponent {
                     user.setSysUserExt(userExt);
                     insertUserAndExt(user);
                     count++;
-                    loginNameSet.add(userNo);
+                    loginNameSet.add(userid);
+                }else{
+                    /*已经存在的，需要先清空职位，更新职位
+                    （首先查询当前用户职位，判断当前职位是否包含当前职位，不存在就更新，存在就不更新）*/
+                    SysUser user = sysUserService.selectUserByLoginName(userid);
+                    if (!user.getSysUserExt().getIsCustomerManager().contains(isManager+"")){
+                        user.getSysUserExt().setIsCustomerManager(user.getSysUserExt().getIsCustomerManager()+","+isManager);
+                        sysUserExtMapper.updateSysUserExt(user.getSysUserExt());
+                    }
                 }
             }catch (Exception e){
                 SyncFailDetail syncFailDetail = new SyncFailDetail();