解决提交bug

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcAssessController.java

@@ -158,14 +158,6 @@ public class CmcAssessController extends BaseController
         cmcAssess.setAssessId(formDataJson.getString("formId"));
         cmcAssessService.insertCmcAssess(cmcAssess);
         for (String key : formDataJson.keySet()) {
-            if (key.equals("projectId"))
-                cmcAssess.setProjectId(formDataJson.getString(key));
-            if (key.equals("assessTime"))
-                cmcAssess.setAssessTime(formDataJson.getDate(key));
-            if (key.equals("otherWork"))
-                cmcAssess.setOtherWork(formDataJson.getString(key));
-            if (key.equals("selfAssess"))
-                cmcAssess.setSelfAssess(formDataJson.getString(key));
             //必填项
             if (key.length() == 5 && key.startsWith("f") && !formDataJson.get(key).equals("")) {
                 CmcAssessContentWork cmcAssessContentWork = new CmcAssessContentWork();
@@ -176,6 +168,16 @@ public class CmcAssessController extends BaseController
                 cmcAssessContent.setContentId(cmcAssess.getAssessId() + key.substring(3));
                 cmcAssessContentService.insertCmcAssessContent(cmcAssessContent);
             }
+        }
+        for (String key : formDataJson.keySet()) {
+            if (key.equals("projectId"))
+                cmcAssess.setProjectId(formDataJson.getString(key));
+            if (key.equals("assessTime"))
+                cmcAssess.setAssessTime(formDataJson.getDate(key));
+            if (key.equals("otherWork"))
+                cmcAssess.setOtherWork(formDataJson.getString(key));
+            if (key.equals("selfAssess"))
+                cmcAssess.setSelfAssess(formDataJson.getString(key));
             if (key.startsWith("role") && !Objects.equals(formDataJson.get(key), new JSONArray())) {
                 StringBuilder roles = new StringBuilder();
                 for (int i = 0; i < formDataJson.getJSONArray(key).size(); i++) {

oa-back/sql/ry_20231130.sql

@@ -78,7 +78,7 @@ create table sys_user (
 -- ----------------------------
 -- 初始化-用户信息表数据
 -- ----------------------------
-insert into sys_user values (1, 103, 'admin', 'admin', '00', '', 'admin', '1', '', '$2a$10$7JB720yubVSZvUI0rEqK/.VqGOZTH.ulu33dHOiBE8ByOhJIrdAu2', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, '管理员', null, null, null, null, null);
+insert into sys_user values (1, 103, 'admin', 'admin', '00', '', '15888888888', '1', '', '$2a$10$7JB720yubVSZvUI0rEqK/.VqGOZTH.ulu33dHOiBE8ByOhJIrdAu2', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, '管理员', null, null, null, null, null);
 insert into sys_user values (2, 101, '13982275233', '刘光庆', '00', '', '13982275233', '0', '', '$2a$10$pcdc8BbNDNiWaQUU14BC3eGWxB4sSJOQZBL9QFftkhkjcbYU03DNi', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
 insert into sys_user values (3, 101, '13808211356', '向发廷', '00', '', '13808211356', '0', '', '$2a$10$zynAhjpaUxERmH4yo9R9s.O.oUgpxwRKtKA6X74ncn0z1ajFxqMyq', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
 insert into sys_user values (4, 101, '13608089391', '王 渊', '00', '', '13608089391', '0', '', '$2a$10$sKWfjdS0vJMA194/pu9q/e8Etz6kNBTzlURGDtKreBE8oHsRWP9hW', '0', '0', '', null, null, '2024-01-04 17:22:48', null, null, null, null, null, null, null, null);
@@ -754,7 +754,7 @@ create table sys_user_post
 -- ----------------------------
 -- 初始化-用户与岗位关联表数据
 -- ----------------------------
-insert into sys_user_post values (1, 1);
+insert into sys_user_post values (1, 26);
 insert into sys_user_post values (2, 1);
 insert into sys_user_post values (2, 2);
 insert into sys_user_post values (3, 3);