修改bug

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/exception/handle/GlobalExceptionHandler.java

@@ -20,29 +20,30 @@ import javax.servlet.http.HttpServletRequest;
 @RestControllerAdvice
 public class GlobalExceptionHandler {
 
-	private Logger log = LoggerFactory.getLogger(this.getClass());
-
-	public GlobalExceptionHandler() {
-	}
-
-	@ExceptionHandler({ Exception.class })
-	public ResponseModel<Object> MethodArgumentNotValidHandler(Exception exception) throws Exception {
-		HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes())
-				.getRequest();
-		ResponseModel<Object> response = new ResponseModel<>();
-
-		//解析平台返回错误信息，统一返回403,app 端统一跳转到登录页面
-		if(exception.getMessage()!=null&&exception.getMessage().indexOf("账号已经在其他设备登录")!=-1 ||exception.getMessage().indexOf("请重新登录")!=-1){
-			response.setStatus(HttpStatus.FORBIDDEN.value());
-		}else{
-			response.setStatus(HttpStatus.INTERNAL_SERVER_ERROR.value());
-		}
-
-		response.setDevMessage("FAILED");
-		response.setMessage( exception.getMessage());
-		response.setTraceId(RequestContext.getTraceId());
-		response.setPath(request.getServletPath());exception.printStackTrace();
-		return response;
-	}
+    private Logger log = LoggerFactory.getLogger(this.getClass());
+
+    public GlobalExceptionHandler() {
+    }
+
+    @ExceptionHandler({Exception.class})
+    public ResponseModel<Object> MethodArgumentNotValidHandler(Exception exception) throws Exception {
+        HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes())
+                .getRequest();
+        ResponseModel<Object> response = new ResponseModel<>();
+
+        //解析平台返回错误信息，统一返回403,app 端统一跳转到登录页面
+        if (exception.getMessage() != null && (exception.getMessage().contains("账号已经在其他设备登录") || exception.getMessage().contains("请重新登录"))) {
+            response.setStatus(HttpStatus.FORBIDDEN.value());
+        } else {
+            response.setStatus(HttpStatus.INTERNAL_SERVER_ERROR.value());
+        }
+
+        response.setDevMessage("FAILED");
+        response.setMessage(exception.getMessage());
+        response.setTraceId(RequestContext.getTraceId());
+        response.setPath(request.getServletPath());
+        exception.printStackTrace();
+        return response;
+    }
 
 }

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

@@ -108,11 +108,11 @@ public class OrgUsrController extends BaseController {
         // BUG 2741 首先判断是否为公司 如果公司底下有人员不可直接删除 bykongfm
         //bug 2882 判断是否为部门 如果部门底下有人员不可直接删除 chenzhao 2021-09-27 start
         OrgUsr tempOrg = iOrgUsrService.getById(id.toString());
-        if(tempOrg.getBizOrgType().equals("COMPANY") || tempOrg.getBizOrgType().equals("DEPARTMENT")) {
-            List<OrgUsr> tempList = iOrgUsrService.list(new LambdaQueryWrapper<OrgUsr>().eq(OrgUsr::getParentId,id).eq(OrgUsr::getIsDelete,false));
+        if (tempOrg.getBizOrgType().equals("COMPANY") || tempOrg.getBizOrgType().equals("DEPARTMENT")) {
+            List<OrgUsr> tempList = iOrgUsrService.list(new LambdaQueryWrapper<OrgUsr>().eq(OrgUsr::getParentId, id).eq(OrgUsr::getIsDelete, false));
             /*bug3031 删除机场单位后，队伍所属单位字段数据未清空 2021-10-13 start*/
             List<FireTeam> fireTeams = fireTeamMapper.byTeamId(id);
-            if(tempList.size() > 0 || fireTeams.size() > 0 ) {
+            if (tempList.size() > 0 || fireTeams.size() > 0) {
                 return ResponseHelper.buildResponse("-1");
             }
             /*bug3031 删除机场单位后，队伍所属单位字段数据未清空 2021-10-13 end*/
@@ -120,7 +120,7 @@ public class OrgUsrController extends BaseController {
         //bug 2882 判断是否为部门 如果部门底下有人员不可直接删除 chenzhao 2021-09-27 end
 //        iOrgUsrService.update(new UpdateWrapper<OrgUsr>().eq("sequence_nbr", id).set("is_delete", CommonConstant.IS_DELETE_01));
         /*bug 2812 一次删除多条数据  传入类型修改为string 问题解决 2021-09-09 陈召 开始*/
-      iOrgUsrService.update(new UpdateWrapper<OrgUsr>().eq("sequence_nbr", String.valueOf(id)).set("is_delete", CommonConstant.IS_DELETE_01));
+        iOrgUsrService.update(new UpdateWrapper<OrgUsr>().eq("sequence_nbr", String.valueOf(id)).set("is_delete", CommonConstant.IS_DELETE_01));
         /*bug 2812 一次删除多条数据  传入类型修改为string 问题解决 2021-09-09 陈召 结束*/
         try {
             eSOrgUsrService.deleteById(id);
@@ -144,7 +144,7 @@ public class OrgUsrController extends BaseController {
     public ResponseModel<?> updateByIdOrgUsr(HttpServletRequest request, @RequestBody OrgUsrDto OrgUsrVo, @PathVariable Long id) throws Exception {
         OrgUsrVo.setBizOrgType(CommonConstant.BIZ_ORG_TYPE_COMPANY);
 //        iOrgUsrService.updateByIdOrgUsr(OrgUsrVo, id);
-        return ResponseHelper.buildResponse( iOrgUsrService.updateByIdOrgUsr(OrgUsrVo, id));
+        return ResponseHelper.buildResponse(iOrgUsrService.updateByIdOrgUsr(OrgUsrVo, id));
     }
 
 
@@ -227,7 +227,6 @@ public class OrgUsrController extends BaseController {
     @RequestMapping(value = "/list", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "列表分页查询", notes = "列表分页查询")
     public IPage<OrgUsr> listPage(String pageNum, String pageSize, OrgUsr orgUsr) {
-
         Page<OrgUsr> pageBean;
         QueryWrapper<OrgUsr> orgUsrQueryWrapper = new QueryWrapper<>();
         Class<? extends OrgUsr> aClass = orgUsr.getClass();
@@ -255,6 +254,7 @@ public class OrgUsrController extends BaseController {
             } catch (Exception e) {
             }
         });
+        orgUsrQueryWrapper.eq("is_delete", 0);
         IPage<OrgUsr> page;
         if (StringUtils.isBlank(pageNum) || StringUtils.isBlank(pageSize)) {
             pageBean = new Page<>(0, Long.MAX_VALUE);
@@ -450,11 +450,11 @@ public class OrgUsrController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @RequestMapping(value = {"/getLoginUserDetails/{userId}", "/getLoginUserDetails"}, method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "获取登陆人绑定的人员关系", notes = "获取登陆人绑定的人员关系")
-    public ResponseModel<List<Map<String, Object>>> getLoginUserDetails(@PathVariable(required=false) String userId) {
+    public ResponseModel<List<Map<String, Object>>> getLoginUserDetails(@PathVariable(required = false) String userId) {
         AgencyUserModel user = getUserInfo();
         String userIds = userId;
         if (StringUtils.isEmpty(userIds)) {
-            userIds =  user.getUserId();
+            userIds = user.getUserId();
         }
         List<Map<String, Object>> loginUserDetails = iOrgUsrService.getLoginUserDetails(userIds, user);
         return ResponseHelper.buildResponse(loginUserDetails);
@@ -465,7 +465,7 @@ public class OrgUsrController extends BaseController {
     @ApiOperation(httpMethod = "GET", value = "获取最上级station", notes = "获取最上级建筑信息")
     public ResponseModel<JSONObject> getBuliding(@PathVariable Long id) {
         JSONObject equipjSONObject = this.getBulid(id);
-        return  ResponseHelper.buildResponse(equipjSONObject);
+        return ResponseHelper.buildResponse(equipjSONObject);
     }
 
     public JSONObject getBulid(Long id) {
@@ -477,11 +477,12 @@ public class OrgUsrController extends BaseController {
         if (!"0".equals(equipjSONObject.getString("parentId"))) {
             String parentId = equipjSONObject.getString("parentId");
             if (StringUtils.isNotBlank(parentId)) {
-                return    getBulid(Long.parseLong(parentId));
+                return getBulid(Long.parseLong(parentId));
             }
         }
         return equipjSONObject;
     }
+
     /**
      * 判断关联账户是否已关联
      *
@@ -491,7 +492,7 @@ public class OrgUsrController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/getAmosId/{amosId}", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "判断关联账户是否已关联", notes = "判断关联账户是否已关联")
-    public  ResponseModel<Object> getAmosId(@PathVariable String amosId) {
+    public ResponseModel<Object> getAmosId(@PathVariable String amosId) {
 
         return ResponseHelper.buildResponse(iOrgUsrService.amosIdExist(amosId));
     }
@@ -572,7 +573,7 @@ public class OrgUsrController extends BaseController {
     public ResponseModel<List<OrgUsr>> getPersonListByCompanyId(@PathVariable String companyId) {
         return ResponseHelper.buildResponse(iOrgUsrService.getPersonListByCompanyId(companyId));
     }
-    
+
     /**
      * 根据id获取单位人员列表
      *