소스 검색

提交人员数据bug修复
提交机构树按当前登录人管理的报价树,如果是管理人查询上级部门id

hxl13994548489 2 년 전
부모
커밋
57788121fe

+ 11 - 2
src/main/java/com/ydtech/modules/admin/controller/SysDeptController.java

@@ -154,10 +154,19 @@ public class SysDeptController extends BaseController {
      */
     @ApiOperation(value = "获取所有的树结构")
     @GetMapping(value = "/findAllTree")
-    public HttpResult<List<SysDept>> findAllTree() {
+    public HttpResult<List<SysDept>> findAllTree(String deptId) {
+        if(deptId==null || "".equals(deptId)){
+            deptId="9";
+        }else{
+            //如果是平台下判断包含D的查询上级id
+            if(deptId.contains("D")){
+               SysDept dept = sysDeptService.getById(deptId);
+                deptId =dept==null?"":dept.getParentId();
+            }
+        }
         LambdaQueryWrapper<SysDept> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(SysDept::getDelFlag, 0);
-        return HttpResult.ok(sysDeptService.findTree("9",null));
+        return HttpResult.ok(sysDeptService.findTree(deptId,null));
     }
     @ApiOperation(value = "省市区门店列表查询 省级parentId=99 市县传值上级id,level传值省市县门店1,2,3,4")
     @GetMapping(value = "/queryListByParentId/{level}/{parentId}")

+ 8 - 2
src/main/java/com/ydtech/modules/admin/service/impl/UserReportServiceImpl.java

@@ -569,8 +569,14 @@ public class UserReportServiceImpl implements UserReportService {
         vo.setTeamnum(userIds.size());
         if(userIds!=null && userIds.size()>0){
             TaskStatisticsDto taskStatisticsDto = insAreaCompanyMapper.numberQuotationsByUserIds(userIds,null);
-            vo.setSumpremium(Double.valueOf(taskStatisticsDto.getTotalPremium()));
-            vo.setUsernum(Integer.valueOf(taskStatisticsDto.getUnderwritingCount().toString()));
+            if(taskStatisticsDto==null){
+                vo.setSumpremium(0);
+                vo.setUsernum(0);
+            }else{
+                vo.setSumpremium(Double.valueOf(taskStatisticsDto.getTotalPremium()==null?"0":taskStatisticsDto.getTotalPremium()));
+                vo.setUsernum(Integer.valueOf(taskStatisticsDto.getUnderwritingCount() ==null?"0":taskStatisticsDto.getUnderwritingCount().toString()));
+            }
+
         }else{
             vo.setSumpremium(0);
             vo.setUsernum(0);