修改orgUsr接口

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

@@ -21,6 +21,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
+import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -90,24 +91,22 @@ public class CompanyServiceImpl extends BaseService<CompanyDto, Company, Company
      */
     @BusinessIdentify
     public Boolean saveDepartment(DepartmentDto dto){
-        if (dto == null) {
+        if (ValidationUtil.isEmpty(dto)) {
             return false;
         }
 
         //平台添加
-        DepartmentModel departmentModel1 = new DepartmentModel( );
+        DepartmentModel departmentModel = new DepartmentModel( );
         ReginParams reginParams = orgService.getReginParams();
-        departmentModel1.setCompanySeq(reginParams.getCompany().getSequenceNbr());
-        departmentModel1.setDepartmentName(dto.getDepartmentName());
-        departmentModel1.setLevel("dept");
-        departmentModel1.setParentId(1L);
-        DepartmentModel departmentModel = Privilege.departmentClient.create(departmentModel1).getResult();
+        departmentModel.setCompanySeq(reginParams.getCompany().getSequenceNbr());
+        departmentModel.setDepartmentName(dto.getDepartmentName());
+        departmentModel.setLevel("dept");
+        departmentModel.setParentId(1L);
+        departmentModel = Privilege.departmentClient.create(departmentModel).getResult();
         //业务添加
         JSONObject jsonObject = new JSONObject( );
         jsonObject.put("amosOrgId",departmentModel.getSequenceNbr());
         jsonObject.put("amosOrgCode",departmentModel.getOrgCode());
-        jsonObject.put("departmentName",dto.getDepartmentName());
-        jsonObject.put("departmentHead",dto.getDepartmentHead());
         OrgUsrDto orgUsrDto = orgService.dataHandling(jsonObject, OrgEnum.部门.getKey( ), null);
 
         return  true;

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

@@ -217,9 +217,12 @@ public class OrgServiceImpl {
      */
     public Map getdetialInfo(String sequenceNbr){
         Map map = new HashMap();
+        OrgUsr orgUsr = getOrgUsrById(sequenceNbr);
+        String type = orgUsr.getOrgExpandAttr1();
         LambdaQueryWrapper<DynamicFormInstance> instanceWrapper = new LambdaQueryWrapper<>();
         instanceWrapper.eq(DynamicFormInstance :: getInstanceId,sequenceNbr);
         List<DynamicFormInstance> dynamicFormInstanceList = alertFormValueServiceImpl.list(instanceWrapper);
+        map.put("type",type);
         map.put("sequenceNbr",sequenceNbr);
         for (DynamicFormInstance dynamicFormInstance : dynamicFormInstanceList) {
             map.put(dynamicFormInstance.getFieldCode(),dynamicFormInstance.getFieldValue());