其他部门提交考核表

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

@@ -97,11 +97,15 @@ public class CmcAssessController extends BaseController
         formData.put("deptName", deptService.selectDeptById(userService.selectUserById(userId).getDeptId()).getDeptName());
         formData.put("postGroup", userService.selectUserPostGroup(userService.selectUserById(userId).getUserName()));
         formData.put("pmLevel", dictDataService.selectDictLabel("sys_user_pmlevel", userService.selectUserById(userId).getPmLevel()));
-        String[] titles = userService.selectUserById(userId).getTitles().split(",");
-        List<String> titleList = new ArrayList<>();
-        for (String title : titles)
-            titleList.add(dictDataService.selectDictLabel("sys_user_titles", title));
-        formData.put("titles", String.join(",", titleList));
+        if (userService.selectUserById(userId).getTitles() != null && !userService.selectUserById(userId).getTitles().equals("")) {
+            String[] titles = userService.selectUserById(userId).getTitles().split(",");
+            List<String> titleList = new ArrayList<>();
+            for (String title : titles)
+                titleList.add(dictDataService.selectDictLabel("sys_user_titles", title));
+            formData.put("titles", String.join(",", titleList));
+        }
+        else
+            formData.put("titles", userService.selectUserById(userId).getTitles());
         formData.put("remark", userService.selectUserById(userId).getRemark());
         formData.put("entryDate", userService.selectUserById(userId).getEntryDate());
         formData.put("age", userService.selectUserById(userId).getAge());
@@ -162,9 +166,17 @@ public class CmcAssessController extends BaseController
                 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())) {
+            //必填项
+            if (key.length() == 5 && key.startsWith("f") && !formDataJson.get(key).equals("")) {
+                CmcAssessContentWork cmcAssessContentWork = new CmcAssessContentWork();
+                cmcAssessContentWork.setWorkId(cmcAssess.getAssessId() + key.substring(1));
+                cmcAssessContentWork.setWorkLoad(formDataJson.getString(key));
+                cmcAssessContentWorkService.insertCmcAssessContentWork(cmcAssessContentWork);
                 CmcAssessContent cmcAssessContent = new CmcAssessContent();
-                cmcAssessContent.setContentId(cmcAssess.getAssessId() + key.substring(4));
+                cmcAssessContent.setContentId(cmcAssess.getAssessId() + key.substring(3));
+                cmcAssessContentService.insertCmcAssessContent(cmcAssessContent);
+            }
+            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++) {
                     String rolei = "";
@@ -174,14 +186,9 @@ public class CmcAssessController extends BaseController
                         rolei = formDataJson.getJSONArray(key).getString(i) + ",";
                     roles.append(rolei);
                 }
+                CmcAssessContent cmcAssessContent = cmcAssessContentService.selectCmcAssessContentByContentId(cmcAssess.getAssessId() + key.substring(4)).get(0);
                 cmcAssessContent.setRole(roles.toString());
-                cmcAssessContentService.insertCmcAssessContent(cmcAssessContent);
-            }
-            if (key.length() == 5 && key.startsWith("f") && !formDataJson.get(key).equals("")) {
-                CmcAssessContentWork cmcAssessContentWork = new CmcAssessContentWork();
-                cmcAssessContentWork.setWorkId(cmcAssess.getAssessId() + key.substring(1));
-                cmcAssessContentWork.setWorkLoad(formDataJson.getString(key));
-                cmcAssessContentWorkService.insertCmcAssessContentWork(cmcAssessContentWork);
+                cmcAssessContentService.updateCmcAssessContent(cmcAssessContent);
             }
             if (key.startsWith("familiar")) {
                 CmcAssessContent cmcAssessContent = cmcAssessContentService.selectCmcAssessContentByContentId(cmcAssess.getAssessId() + key.substring(8)).get(0);

oa-ui/src/views/system/user/index.vue

@@ -273,7 +273,7 @@
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item label="技术职称" prop="titles">
+            <el-form-item label="技术职称">
               <el-select v-model="form.titles" multiple placeholder="请输入技术职称">
                 <el-option
                   v-for="dict in dict.type.sys_user_titles"
@@ -437,6 +437,7 @@ export default {
       postOptions: [],
       // 角色选项
       roleOptions: [],
+      titles: [],
       // 表单参数
       form: {},
       pm: false,
@@ -635,6 +636,9 @@ export default {
         this.roleOptions = response.roles;
         this.$set(this.form, "postIds", response.postIds);
         this.$set(this.form, "roleIds", response.roleIds);
+        for (let i = 0; i < response.data.titles.split(",").length; i++)
+          this.titles[i] = response.data.titles.split(",")[i]
+        this.$set(this.form, "titles", this.titles);
         this.open = true;
         this.title = "修改用户";
         this.form.password = "";
@@ -664,6 +668,7 @@ export default {
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.userId != undefined) {
+            this.form.titles = this.form.titles.join(',')
             updateUser(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;