Browse Source

经销商过滤导购,门店。导购经销商经销商id不作单独处理019排除

njs 2 years ago
parent
commit
3900cea584

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

@@ -602,11 +602,11 @@ public class AnalysisDiyCustomerComponent {
                     } else {
                         userExt.setOrgCode(orgCode);
                     }
-                    if (isManager == 0) {
+                   /* if (isManager == 0) {
                         userExt.setCustomerCode(code);
-                    } else {
+                    } else {*/
                         userExt.setCustomerCode(jo.getString("depCode"));
-                    }
+                   // }
 //                    /**======== 构建diy用户wx信息表 start===============*/
 //                    WxQyUser wxQyUser = new WxQyUser();
 //                    wxQyUser.setUserid(jo.getString("userid"));
@@ -634,6 +634,10 @@ public class AnalysisDiyCustomerComponent {
 //                    }
                         if (isManager == 0) {
                             sysUserService.insertUserRole(user.getUserId(), roleGuideIds[0]);
+                            if(("019").equals(user.getSysUserExt().getCustomerCode().substring(0, 3))){
+                                user.getSysUserExt().setCustomerCode(jo.getString("depCode"));
+                                sysUserExtMapper.updateSysUserExt(user.getSysUserExt());
+                            }
                         } else {
                             sysUserService.insertUserRole(user.getUserId(), roleIds[0]);
                         }

+ 5 - 0
suishenbang-system/src/main/java/com/dgtly/system/mapper/SysUserExtMapper.java

@@ -21,6 +21,11 @@ public interface SysUserExtMapper
      */
     public SysUserExt selectSysUserExtById(Long userId);
 
+    /**
+     * 查询经销商人员列表除导购,门店经销商用户
+     * **/
+    public SysUserExt selectSysUserCustomerExtById(Long userId);
+
     /**
      * 查询用户销售信息扩展列表
      * 

+ 2 - 0
suishenbang-system/src/main/java/com/dgtly/system/service/ISysUserExtService.java

@@ -21,6 +21,8 @@ public interface ISysUserExtService
      */
     public SysUserExt selectSysUserExtById(Long userId);
 
+    public SysUserExt selectSysUserCustomerExtById(Long userId);
+
     /**
      * 查询用户销售信息扩展列表
      * 

+ 5 - 0
suishenbang-system/src/main/java/com/dgtly/system/service/impl/SysUserExtServiceImpl.java

@@ -33,6 +33,11 @@ public class SysUserExtServiceImpl implements ISysUserExtService
         return sysUserExtMapper.selectSysUserExtById(userId);
     }
 
+    @Override
+    public SysUserExt selectSysUserCustomerExtById(Long userId) {
+        return sysUserExtMapper.selectSysUserCustomerExtById(userId);
+    }
+
     /**
      * 查询用户销售信息扩展列表
      * 

+ 4 - 0
suishenbang-system/src/main/resources/mapper/system/SysUserSalesExtMapper.xml

@@ -42,6 +42,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectSysUserExtVo"/>
         where user_id = #{userId} and is_customer_manager !='0' and is_customer_manager !='8'
     </select>
+    <select id="selectSysUserCustomerExtById" parameterType="Long" resultMap="SysUserExtResult">
+        <include refid="selectSysUserExtVo"/>
+        where user_id = #{userId} and is_customer_manager !='0' and is_customer_manager !='8'
+    </select>
         
     <insert id="insertSysUserExt" parameterType="SysUserExt">
         insert into sys_user_ext

+ 1 - 1
suishenbang-wxportal/suishenbang-wxportal-api/src/main/java/com/dgtly/wxportal/controller/WxPortalController.java

@@ -101,7 +101,7 @@ public class WxPortalController extends ApiBaseController {
         ParameterObject obj = getParameterObject();
         obj.checkParameterNotNull("userId");
         String userId = obj.getString("userId");
-        SysUserExt userExt = userExtService.selectSysUserExtById(Long.parseLong(userId));
+        SysUserExt userExt = userExtService.selectSysUserCustomerExtById(Long.parseLong(userId));
         if (userExt!=null){
             List<SysUser> userList = userService.selectUserByOrgCode(userExt.getOrgCode());
             return AjaxResult.success().putKV("userList",userList);