Просмотр исходного кода

修改销售下拉框没有下级的问题

huangxuechao 4 лет назад
Родитель
Сommit
dc11e156f0

+ 18 - 1
jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/policy/controller/CwjsPolicyInfoController.java

@@ -12,6 +12,7 @@ import javax.servlet.http.HttpServletResponse;
 import cn.com.ctop.common.module.entity.UserCompany;
 import cn.com.ctop.common.module.mapper.MailLogMapper;
 import cn.com.ctop.common.module.mapper.SysUserMapper;
+import cn.com.ctop.common.module.service.ISysUserService;
 import cn.com.ctop.common.module.service.IUserCompanyService;
 import cn.com.ctop.common.module.utils.CorpWexinUtils;
 import com.alibaba.fastjson.JSONArray;
@@ -85,6 +86,8 @@ public class CwjsPolicyInfoController {
 	 CorpWexinUtils corpWexinUtils;
 	 @Resource
 	 MailLogMapper mailLogMapper;
+     @Autowired
+     private ISysUserService sysUserService;
 
 	 @GetMapping(value = "/queryApprovalRejectReason")
 	 public Result<CwjsPolicyApprovalLog> queryApprovalRejectReason(@RequestParam(name="id",required=true) Integer id){
@@ -277,10 +280,24 @@ public class CwjsPolicyInfoController {
         String roleCode = roleService.getRoleCodeByUserId(userId);
         List<JSONObject> allSaleList;
         if("admin".equalsIgnoreCase(roleCode) || "finance".equalsIgnoreCase(roleCode)){
-            allSaleList = cwjsPolicyInfoService.getAllSale();
+            allSaleList = cwjsPolicyInfoService.getAllSale();   //所有销售角色和管理员
         }else{
             allSaleList = cwjsPolicyInfoService.getAllSaleByUserId(userId);
+            List<JSONObject> allSubordinate = cwjsPolicyInfoService.getAllSubordinate2(userId);
+            if(!Check.isNull(allSubordinate)){
+                allSaleList.addAll(allSubordinate);
+            }
         }
+
+        if(Check.isNull(allSaleList)){
+            allSaleList = new ArrayList<>();
+            SysUser sysUser = sysUserService.getById(userId);
+            JSONObject jo = new JSONObject();
+            jo.put("userId",sysUser.getId());
+            jo.put("userName",sysUser.getRealname());
+
+        }
+
 		return Result.OK(allSaleList);
 	}
 

+ 1 - 0
jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/policy/mapper/xml/CwjsPolicyInfoMapper.xml

@@ -46,6 +46,7 @@
             , 'saleAssistant'
             , 'salesSupportManager'
             , 'saleAm'
+            ,'admin'
             )
 
     </select>

+ 2 - 0
jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/policy/service/ICwjsPolicyInfoService.java

@@ -22,4 +22,6 @@ public interface ICwjsPolicyInfoService extends IService<CwjsPolicyInfo> {
     List<JSONObject> getAllSaleByUserId(String userId);
 
     List<String> getAllSubordinate(String userId);
+
+    List<JSONObject> getAllSubordinate2(String userId);
 }

+ 15 - 0
jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/policy/service/impl/CwjsPolicyInfoServiceImpl.java

@@ -79,6 +79,21 @@ public class CwjsPolicyInfoServiceImpl extends ServiceImpl<CwjsPolicyInfoMapper,
     @Autowired
     private SysUserMapper userMapper;
     @Override
+    public List<JSONObject> getAllSubordinate2(String userId){
+        List<SysUser> allList = userMapper.selectAllUser();
+        List<SysUser> mulUserList = treeCategoryData(allList, userId);
+        List<JSONObject> users = new ArrayList<>();
+        mulUserList.forEach(mulUser -> {
+            JSONObject jo = new JSONObject();
+            jo.put("userId",mulUser.getId());
+            jo.put("userName",mulUser.getRealname());
+            users.add(jo);
+        });
+        return users;
+    }
+
+
+    @Override
     public List<String> getAllSubordinate(String userId){
         List<SysUser> allList = userMapper.selectAllUser();
         List<SysUser> mulUserList = treeCategoryData(allList, userId);

+ 1 - 1
jeecg-boot-module-system/src/main/java/cn/com/ctop/common/module/service/impl/UserCompanyServiceImpl.java

@@ -61,7 +61,7 @@ public class UserCompanyServiceImpl extends ServiceImpl<UserCompanyMapper, UserC
                     String departName = depart.getDepartName();
                     if(!Check.isNull(departName)){
                         if(departName.trim().contains("北京汇创思拓数字科技有限公司")){
-                            userCompany.setNickName("华北石家庄");
+                            userCompany.setNickName("华北,石家庄");
                         }
                         if(departName.trim().contains("上海汇创思拓数字科技有限公司")){
                             userCompany.setNickName("华东");