feat: 优化配置和人员拉取

src/main/java/com/budwk/app/sys/services/impl/SysDataUserPullServiceImpl.java

@@ -229,9 +229,8 @@ public class SysDataUserPullServiceImpl extends BaseServiceImpl<Sys_user_source>
                     sysUser.setUnitName(resolvedUnit.getName());
                     sysUser.setUnitPath(resolvedUnit.getPath());
                 }
-                if (!dataCenterProperties.isTokenEnabled()
+                if (resolvedUnit == null || StrUtil.isBlank(resolvedUnit.getPath())) {
-                        && (resolvedUnit == null || StrUtil.isBlank(resolvedUnit.getPath()))) {
+                    log.warn("人员{}所属机构{}不存在或路径为空，保留当前机构号并继续拉取", sysUser.getLoginname(), sysUser.getUnitId());
-                    throw new BaseException("人员{}所属机构不存在或路径为空，中止本次同步", sysUser.getLoginname());
                 }
 
                 // 设置拉取时间

src/main/java/com/budwk/app/web/commons/base/Globals.java

@@ -59,10 +59,8 @@ public class Globals {
     private SysTaskService sysTaskService;
     @Inject
     private PropertiesProxy conf;
-    private static String productionAppDomain;
 
     public void init() {
-        productionAppDomain = conf.get("custom.app-domain");
         initSysConfig(sysConfigService);
         initRoute(sysRouteService);
         initTask(sysTaskService);
@@ -97,9 +95,6 @@ public class Globals {
                 default -> Globals.MyConfig.put(sysConfig.getConfigKey(), sysConfig.getConfigValue());
             }
         }
-        if (Strings.isNotBlank(productionAppDomain)) {
-            Globals.AppDomain = productionAppDomain;
-        }
     }
 
     public static void initRoute(SysRouteService sysRouteService) {

src/main/resources/application-prd.yaml

@@ -39,7 +39,7 @@ sdk:
     server-login-url: https://authserver.zjnu.edu.cn/authserver/login
     qi-wx-server-login-url: https://authserver.zjnu.edu.cn/authserver/login
     client-host-url: https://lxy.zjnu.edu.cn
-    client-call-back-url: /sso/login
+    client-call-back-url: /platform/sso/login
     validation-type: cas
   minio:
     accessKey: minioadmin
@@ -48,7 +48,6 @@ sdk:
     bucket: zjnu
 
 custom:
-  app-domain: https://lxy.zjnu.edu.cn
   spdb:
     bab7:
       url: http://localhost:8888/supplierOpenApi/pointOrder/queryOrderInfo

src/main/resources/views/platform/zhgh/democratic/proposal/transact/write/index.html

@@ -161,7 +161,7 @@ layout("/layouts/platform.html"){
                     <!--                        <pc-signature v-model="formData.signature"></pc-signature>-->
                     <!--                    </el-form-item>-->
         </el-form>
-        <template slot="footer" v-if="isWriteTime">
+        <template slot="footer" v-if="isWriteTime && proposalConfigLoaded">
             <el-button type="primary" @click="onSave" :loading="formLoading">保存</el-button>
             <el-button type="primary" @click="onSubmit" v-if="!taskId" :loading="formLoading">提交</el-button>
             <el-button type="primary" @click="onSubmitAgain" v-else :loading="formLoading">提交</el-button>
@@ -278,9 +278,10 @@ layout("/layouts/platform.html"){
                     signature: [{required: false, message: "请扫描二维码进行签字", trigger: ["blur", "change"]}]
                 },
                 proposalConfig: {},
+                proposalConfigLoaded: false,
                 noticeDialogVisible: false,
 
-                isWriteTime: true,
+                isWriteTime: false,
 
                 // 建议办理单位
                 suggestUnitOptions: []
@@ -470,7 +471,12 @@ layout("/layouts/platform.html"){
             getProposalConfig() {
                 return this.$axios.post("/platform/proposal/common/config").then((res) => {
                     if (res.code === 0) {
-                        this.proposalConfig = res.data
+                        this.proposalConfig = res.data || {}
+                        this.proposalConfigLoaded = !!res.data
+                        if (!this.proposalConfigLoaded) {
+                            this.noticeDialogVisible = false
+                            this.$message.warning("尚未配置提案参数，暂不能保存或提交提案")
+                        }
                     }
                 })
             },
@@ -510,15 +516,22 @@ layout("/layouts/platform.html"){
             listOpenSession(isModify = false) {
                 return this.$axios.post("/platform/proposal/common/listOpenSession").then((res) => {
                     if (res.code === 0) {
-                        this.sessionOptions = res.data
+                        this.sessionOptions = res.data || []
                         let delegationPromise = Promise.resolve()
-                        if (!isModify && this.sessionOptions) {
+                        if (!isModify && !this.sessionOptions.length) {
+                            this.isWriteTime = false
+                            this.$message.warning("当前没有开启的教代会，暂不能撰写提案")
+                            return
+                        }
+                        if (!isModify) {
                             this.$set(this.formData, "sessionId", this.sessionOptions[0].id)
                             // 获取代表团
                             delegationPromise = this.searchMineDelegation().then(() => {
                                 // 检查是否在撰写时间内
                                 this.checkWriteTime()
                             })
+                        } else {
+                            this.checkWriteTime()
                         }
                         return delegationPromise.then(() => this.listDelegation()).then(() => this.listProposalType())
                     }