修改扫描的错误

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/OrgUsrServiceImpl.java

@@ -83,6 +83,8 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 	private static final String COMPANY_FIELD_CODE = "companyLocation,longitude,latitude";
 	private static final String COMPANY_VALUE = "COMPANY";
 
+	private static final String FIREFIGHTERSID ="firefighters_id";
+
 	@Value("${logic}")
 	Boolean logic;
 
@@ -2655,7 +2657,6 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 	public void updateByIdOrgPersonFlc(OrgPersonDto OrgPersonVo, Long id) throws Exception {
 		// 修改人员信息
 		OrgUsr orgUsr = new OrgUsr();
-		OrgUsr oriOrgUsr = getById(id);
 		BeanUtils.copyProperties(OrgPersonVo, orgUsr);
 		orgUsr.setSequenceNbr(id);
 		updateById(orgUsr);
@@ -2814,7 +2815,6 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 
 	@Override
 	public List<OrgMenuDto> companyTreeByUser(ReginParams reginParams) {
-		Map<String, Object> param = new HashMap<>();
 		// 权限处理
 		PermissionInterceptorContext.setDataAuthRule(authKey);
 		LambdaQueryWrapper<OrgUsr> wrapper = new LambdaQueryWrapper<>();
@@ -3231,7 +3231,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 				return "-1";
 			}
 			QueryWrapper<FirefightersJacket> queryWrapper = new QueryWrapper<>();
-			queryWrapper.eq("firefighters_id", firefightersSequenceNbr);
+			queryWrapper.eq(FIREFIGHTERSID, firefightersSequenceNbr);
 			queryWrapper.eq("is_delete", 0);
 			List<FirefightersJacket> firefightersJacket = firefightersJacketMapper.selectList(queryWrapper);
 			if (firefightersJacket != null && firefightersJacket.size() > 0) {
@@ -3305,23 +3305,23 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 
 		//BUG 2761 判断人员删除时的逻辑 如果被选为队伍联系人则无法被删除 bykongfm
 		List fireTeam = iFireTeamService.list(new LambdaQueryWrapper<FireTeam>().eq(FireTeam::getIsDelete, false).eq(FireTeam::getContactUserId, userId));
-		if (fireTeam.size() > 0) {
+		if (!fireTeam.isEmpty()) {
 			return "-1";
 		}
 		QueryWrapper<FirefightersJacket> queryWrapper = new QueryWrapper<>();
-		queryWrapper.eq("firefighters_id", id);
+		queryWrapper.eq(FIREFIGHTERSID, id);
 		queryWrapper.eq("is_delete", 0);
 		List<FirefightersJacket> firefightersJacket = firefightersJacketMapper.selectList(queryWrapper);
-		if (firefightersJacket != null && firefightersJacket.size() > 0) {
+		if (!firefightersJacket.isEmpty()) {
 			// BUG 2222 by litw start 2021年9月10日
 			return "-2";
 		}
 		try {
 			this.iFirefightersService.update(new UpdateWrapper<Firefighters>().eq("sequence_nbr", id).set("is_delete", 1));
 			iFirefightersThoughtService
-					.update(new UpdateWrapper<FirefightersThought>().eq("firefighters_id", id).set("is_delete", 1));
+					.update(new UpdateWrapper<FirefightersThought>().eq(FIREFIGHTERSID, id).set("is_delete", 1));
 			iFirefightersContractService
-					.update(new UpdateWrapper<FirefightersContract>().eq("firefighters_id", id).set("is_delete", 1));
+					.update(new UpdateWrapper<FirefightersContract>().eq(FIREFIGHTERSID, id).set("is_delete", 1));
 
 			FirefightersJacket firefightersJacket1 = new FirefightersJacket();
 			firefightersJacket1.setFirefightersId(id);