Browse Source

限定项目客户情况查询修改

anderx 1 year ago
parent
commit
5da58398c9

+ 2 - 1
src/main/java/com/goafanti/business/bo/UserRestrictProjectBo.java

@@ -3,7 +3,8 @@ package com.goafanti.business.bo;
 public class UserRestrictProjectBo {
     private String uid;
     /**
-     * 0 自己的客户 1不是自己但是限定项目客户 2 不是自己并且没有限定项目客户 3 公共客户 4业务员
+     * 0 自己的客户 1非客户有限定 营销员  2 非客户无限定 3 公共客户 4业务员 5非客户有限定 非营销员
+     * 只1的情况下需要提示
      */
     private Integer type;
 

+ 6 - 11
src/main/java/com/goafanti/business/service/impl/RestrictProjectServiceImpl.java

@@ -217,20 +217,12 @@ public class RestrictProjectServiceImpl extends BaseMybatisDao<RestrictProjectMa
         String aid=TokenManager.getAdminId();
         Admin my = adminMapper.selectByPrimaryKey(aid);
         boolean flag= my.getPublicPurview() == 1;
-        List<Role> roles = adminMapper.selectRolesByPrimaryKey(aid);
-        boolean flag2=false;
-        for (Role role : roles) {
-            if (AFTConstants.SALESMAN.equals(role.getRoleType().toString())){
-                flag2=true;
-                break;
-            }
-        }
         if (ids!=null&& !ids.isEmpty()){
             String[] split = ids.split(",");
             for (String s : split) {
                 UserRestrictProjectBo bo = new UserRestrictProjectBo();
                 bo.setUid(s);
-                bo.setAdminSalesman(flag2?1:0);
+                bo.setAdminSalesman(0);
                 User user = userMapper.selectByPrimaryKey(s);
                 bo.setUserName(user.getNickname());
                 if (!flag){
@@ -244,8 +236,11 @@ public class RestrictProjectServiceImpl extends BaseMybatisDao<RestrictProjectMa
                             List<RestrictProject> restrictProjects = restrictProjectMapper.selectListByParam(new InputRestrictProject(s, aid));
                             if (!restrictProjects.isEmpty()){
                                 // 有限定项目
-                                bo.setType(1);
-
+                                if(TokenManager.hasRole(AFTConstants.SALESMAN)){
+                                    bo.setType(1);
+                                }else {
+                                    bo.setType(5);
+                                }
                             }else{
                                 //没有限定
                                 bo.setType(2);