修改bug

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

@@ -99,10 +99,19 @@ public class OrgUsrController extends BaseController {
     @RequestMapping(value = "/{id}", method = RequestMethod.DELETE)
     @ApiOperation(httpMethod = "DELETE", value = "根据id删除", notes = "根据id删除")
     public ResponseModel<String> deleteById(HttpServletRequest request, @PathVariable Long id) {
+
         // 删除时，只作逻辑删除
         // BUG 2741 首先判断是否为公司 如果公司底下有人员不可直接删除 bykongfm
         //bug 2882 判断是否为部门 如果部门底下有人员不可直接删除 chenzhao 2021-09-27 start
         OrgUsr tempOrg = iOrgUsrService.getById(id.toString());
+        //当前登录人不能删除自己
+        AgencyUserModel user = getUserInfo();
+
+        if(tempOrg.getAmosOrgId()!=null&&tempOrg.getAmosOrgId().equals(user.getUserId())){
+
+            return ResponseHelper.buildResponse("-1");
+        }
+
         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*/

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

@@ -1002,6 +1002,8 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
         orgUsrMapper.updatelistByParentId(orgUsr.getBizOrgCode(), oriOrgUsr.getBizOrgCode());
 //        saveOrgUsr(orgUsr, oriOrgUsr);
         // 保存动态表单数据
+
+        updateById(orgUsr);
         updateDynamicFormInstance(orgUsr.getSequenceNbr(), OrgDepartmentVo.getDynamicFormValue());
         OrgDepartmentVo.setBizOrgCode(orgUsr.getBizOrgCode());
         return OrgDepartmentVo;