修改bug

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

@@ -258,8 +258,12 @@ public class FirefightersServiceImpl extends BaseService<FirefightersDto, Firefi
 					if (!ValidationUtil.isEmpty(orgUsrAgencyUser)) {
 						orgUsrAgencyUserMapper.delete(new QueryWrapper<OrgUsrAgencyUser>().eq("org_usr_id", id));
 						// 删除已经创建的管理员账号
+						FeignClientResult<AgencyUserModel> feignClientResult = Privilege.agencyUserClient
+								.queryByUserId(orgUsrAgencyUser.getAmosUserId());
+						if (feignClientResult != null) {
 							Privilege.agencyUserClient.multDeleteUser(orgUsrAgencyUser.getAmosUserId());
 						}
+					}
 					//删除cb_org_usr相关字段
 					OrgUsr orgUsr1 = orgUsrMapper.queryBySequenceNbr(id.toString());
 					if(!ValidationUtil.isEmpty(orgUsr1)){

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/SupervisionConfigureController.java

@@ -270,7 +270,7 @@ public class SupervisionConfigureController extends AbstractBaseController {
             String nowStrLong = DateUtils.getNowStrLong();
             Date mounthDate = null;
             try {
-                mounthDate = DateUtils.getCurrentMonthEndTime(new Date());
+                mounthDate = DateUtils.getCurrentMonthStartTime(new Date());
             } catch (Exception e) {
                 throw new RuntimeException(e);
             }