修改代码

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/OrgUsrController.java

@@ -989,7 +989,7 @@ public class OrgUsrController extends BaseController {
 	}
 
 
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
 	@ApiOperation(httpMethod = "POST", value = "查询单位基本信息", notes = "查询单位基本信息")
 	@PostMapping(value = "/selectByIdDeptList")
 	public ResponseModel<Object> selectByIdDeptList(@RequestBody String ids) throws Exception {
@@ -1001,7 +1001,7 @@ public class OrgUsrController extends BaseController {
 		List<OrgUsr> orgUsrList =orgUsrMapper.selectList(wrapper);
 		return ResponseHelper.buildResponse(orgUsrList);
 	}
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
 	@ApiOperation(httpMethod = "POST", value = "查询单位基本信息", notes = "查询单位基本信息")
 	@PostMapping(value = "/selectByAmosOrgIdDeptList")
 	public ResponseModel<Object> selectByAmosOrgIdDeptList(@RequestBody String ids) throws Exception {

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/controller/PointController.java

@@ -109,7 +109,7 @@ public class PointController extends AbstractBaseController {
 	/**
 	 * 查询巡检点的巡检项
 	 *
-	 * @param id
+	 * @param
 	 * @return
 	 */
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
@@ -969,7 +969,7 @@ public class PointController extends AbstractBaseController {
 	/**
 	 * 查询巡检点的巡检项
 	 *
-	 * @param id
+	 * @param
 	 * @return
 	 */
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
@@ -987,7 +987,7 @@ public class PointController extends AbstractBaseController {
 	/**
 	 * 查询巡检点的巡检项
 	 *
-	 * @param id
+	 * @param
 	 * @return
 	 */
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
@@ -1005,7 +1005,7 @@ public class PointController extends AbstractBaseController {
 	/**
 	 * 查询巡检点的分类
 	 *
-	 * @param id
+	 * @param
 	 * @return
 	 */
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
@@ -1024,7 +1024,7 @@ public class PointController extends AbstractBaseController {
 	/**
 	 * 根据分类id查询对应项
 	 *
-	 * @param id
+	 * @param
 	 * @return
 	 */
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
@@ -1044,7 +1044,7 @@ public class PointController extends AbstractBaseController {
 	/**
 	 * 根据点id查询点的分类及对应项
 	 *
-	 * @param id
+	 * @param
 	 * @return
 	 */
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
@@ -1163,7 +1163,7 @@ public class PointController extends AbstractBaseController {
 	/**
 	 * 查询巡检点信息
 	 *
-	 * @param point
+	 * @param
 	 * @return
 	 */
 	@TycloudOperation(ApiLevel = UserType.AGENCY)

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/impl/CheckServiceImpl.java

@@ -192,21 +192,6 @@ public class CheckServiceImpl implements ICheckService {
              Map<String, String> deptMapNew= deptMap;
              List<String> userNames = new ArrayList<>();
 
-
-
-             content.forEach(e -> {
-                 userNames.clear();
-                 List<String> userIds1 = Arrays.asList(e.getUserId().split(","));
-                 for(String userId : userIds1){
-                     FeignClientResult result = jcsFeignClient.selectById(userId);
-                     Object result1 = result.getResult();
-                     String personName = ((Map<String, Object>) result1).get("personName").toString();
-                     userNames.add(personName);
-                 }
-                 userNames.remove(null);
-                 e.setUserName(Joiner.on(",").join(userNames));
-//                 e.setDepartmentName(deptMapNew.get(e.getDepId()));
-             });
          }
 		return new PageImpl<>(content, param, total);
     }
@@ -218,35 +203,6 @@ public class CheckServiceImpl implements ICheckService {
             return new PageImpl<>(content, param, total);
         }
         content = checkMapper.getCheckInfoNew(param);
-
-        if (!CollectionUtils.isEmpty(content)) {
-            Set<String> userIds = Sets.newHashSet(Lists.transform(content, CheckInfoVo::getUserId));
-            Set<String> deptIds = Sets.newHashSet(Lists.transform(content, CheckInfoVo::getDepId));
-            deptIds.remove("");
-            deptIds.remove(null);
-            String joinUserId="";
-            for (String userId:userIds) {
-                if(!ObjectUtils.isEmpty(userId)){
-                    joinUserId=joinUserId+userId+",";
-                }
-            }
-            Map<String, String> deptMap =  new HashMap<String,String>();
-            Map<String, String> deptMapNew= deptMap;
-            List<String> userNames = new ArrayList<>();
-            content.forEach(e -> {
-                userNames.clear();
-                List<String> userIds1 = Arrays.asList(e.getUserId().split(","));
-                for(String userId : userIds1){
-                    FeignClientResult result = jcsFeignClient.selectById(userId);
-                    Object result1 = result.getResult();
-                    String personName = ((Map<String, Object>) result1).get("personName").toString();
-                    userNames.add(personName);
-                }
-                userNames.remove(null);
-                e.setUserName(Joiner.on(",").join(userNames));
-            });
-        }
-
         return new PageImpl<>(content, param, total);
     }