Merge branch 'release/v2.3.0' of http://192.168.0.144/dcuc-tjdsj/auth-back into feature-buservice-0621

src/main/java/com/dragoninfo/dcuc/authweb/restcontroller/app/AppController.java

@@ -14,6 +14,7 @@ import com.dragoninfo.dcuc.authweb.business.MtAuthBusiness;
 import com.dragoninfo.dcuc.authweb.common.SysConstants;
 import com.dragoninfo.dcuc.authweb.restcontroller.app.vo.AppVo;
 import com.dragoninfo.dcuc.duceap.facade.IDuceapUploadFacade;
+import com.dragoninfo.dcuc.org.entity.OrgInfo;
 import com.dragoninfo.dcuc.org.facade.IOrgInfoFacade;
 import com.dragoninfo.dcuc.org.vo.OrgTreeNode;
 import com.dragoninfo.dcuc.user.user.entity.UserInfo;
@@ -122,8 +123,18 @@ public class AppController {
             if (!ResponseStatus.SUCCESS_CODE.equals(responseStatus.getStatusCode())) {
                 return Result.fail(ResultEnum.SERVICE_FAIL.getValue(), responseStatus.getMessage());
             }
-            applyInfoDTO.setOrgName(orgInfoFacade.detail(applyInfoDTO.getOrgId()).getFullName());
-
+            String orgId = applyInfoDTO.getOrgId();
+            if(StringUtils.isNotBlank(orgId)) {
+                applyInfoDTO.setOrgName(orgInfoFacade.detail(orgId).getFullName());
+            }
+            String orgCode = appVo.getOrgCode();
+            if(StringUtils.isNotBlank(orgCode)) {
+                OrgInfo orgInfo = orgInfoFacade.getOrgInfoByCode(orgCode);
+                if(null != orgInfo) {
+                    applyInfoDTO.setOrgName(orgInfo.getFullName());
+                    applyInfoDTO.setOrgId(orgInfo.getId());
+                }
+            }
             applyInfoFacade.saveAppIy(applyInfoDTO);
         } catch (Exception e) {
             log.error("save app", e);

src/main/java/com/dragoninfo/dcuc/authweb/restcontroller/app/vo/AppVo.java

@@ -36,6 +36,9 @@ public class AppVo {
     @ApiModelProperty(value = "所属单位id")
     private String orgId;
 
+    @ApiModelProperty(value = "所属单位代码")
+    private String orgCode;
+
     @ApiModelProperty(value = "所属单位名称")
     private String orgName;
 
@@ -51,7 +54,7 @@ public class AppVo {
     @ApiModelProperty(value = "应用状态 0:启用 1:禁用")
     private String applyStatus;
 
-    @ApiModelProperty(value = "应用系统事权单位代码")
+    @ApiModelProperty(value = "应用系统管理单位代码")
     private String managerOrgCode;
 
     @ApiModelProperty(value = "管理单位id")