新增获取当前登陆人所在单位信息（orgUsr表的）

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/controller/InstallNoticeController.java

@@ -50,9 +50,6 @@ public class InstallNoticeController extends BaseController {
 	InstallNoticeServiceImpl installNoticeServiceImpl;
 
 	@Autowired
-	InstallNoticeMapper installNoticeMapper;
-
-	@Autowired
 	ProjectMapper projectMapper;
 
 	@Autowired
@@ -61,6 +58,7 @@ public class InstallNoticeController extends BaseController {
 	@Autowired
 	ProjectServiceImpl projectServiceImpl;
 
+
 	/**
 	 * 新增安装告知表
 	 *
@@ -225,6 +223,7 @@ public class InstallNoticeController extends BaseController {
 			installNoticeDto.setContractAttch(JSON.toJSONString(contractAttch));
 			break;
 			}
+		projectInitiationServiceImpl.execute(projectDto.getInstanceId(),installNoticeDto,"1");
 		return  ResponseHelper.buildResponse(installNoticeServiceImpl.createWithModel(installNoticeDto));
 	}
 

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/service/impl/OrgServiceImpl.java

@@ -9,6 +9,7 @@ import com.yeejoin.amos.boot.biz.common.constants.CommonConstant;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.module.common.api.dto.OrgUsrDto;
+import com.yeejoin.amos.boot.module.common.api.dto.OrgusrDataxDto;
 import com.yeejoin.amos.boot.module.common.api.entity.DynamicFormColumn;
 import com.yeejoin.amos.boot.module.common.api.entity.DynamicFormInstance;
 import com.yeejoin.amos.boot.module.common.api.entity.OrgUsr;
@@ -237,12 +238,20 @@ public class OrgServiceImpl {
      * @return
      */
     public Long getCompanyId(){
+        return getOrgUsr().getSequenceNbr();
+    }
+
+    /**
+     * 获取当前登陆人所在单位信息（orgUsr表的）
+     * @return
+     */
+    public OrgUsr getOrgUsr(){
         LambdaQueryWrapper<OrgUsr> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(OrgUsr :: getAmosOrgId,String.valueOf(getReginParams().getCompany().getSequenceNbr()));
         OrgUsr orgUsr = orgUsrServiceImpl.getOne(wrapper);
         if(ValidationUtil.isEmpty(orgUsr)){
             return  null;
         }
-        return orgUsr.getSequenceNbr();
+        return orgUsr;
     }
 }