lamphua 2 лет назад
Родитель
Сommit
4c3d6a673f

+ 21
- 14
oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcAssessController.java Просмотреть файл

97
         formData.put("deptName", deptService.selectDeptById(userService.selectUserById(userId).getDeptId()).getDeptName());
97
         formData.put("deptName", deptService.selectDeptById(userService.selectUserById(userId).getDeptId()).getDeptName());
98
         formData.put("postGroup", userService.selectUserPostGroup(userService.selectUserById(userId).getUserName()));
98
         formData.put("postGroup", userService.selectUserPostGroup(userService.selectUserById(userId).getUserName()));
99
         formData.put("pmLevel", dictDataService.selectDictLabel("sys_user_pmlevel", userService.selectUserById(userId).getPmLevel()));
99
         formData.put("pmLevel", dictDataService.selectDictLabel("sys_user_pmlevel", userService.selectUserById(userId).getPmLevel()));
100
-        String[] titles = userService.selectUserById(userId).getTitles().split(",");
101
-        List<String> titleList = new ArrayList<>();
102
-        for (String title : titles)
103
-            titleList.add(dictDataService.selectDictLabel("sys_user_titles", title));
104
-        formData.put("titles", String.join(",", titleList));
100
+        if (userService.selectUserById(userId).getTitles() != null && !userService.selectUserById(userId).getTitles().equals("")) {
101
+            String[] titles = userService.selectUserById(userId).getTitles().split(",");
102
+            List<String> titleList = new ArrayList<>();
103
+            for (String title : titles)
104
+                titleList.add(dictDataService.selectDictLabel("sys_user_titles", title));
105
+            formData.put("titles", String.join(",", titleList));
106
+        }
107
+        else
108
+            formData.put("titles", userService.selectUserById(userId).getTitles());
105
         formData.put("remark", userService.selectUserById(userId).getRemark());
109
         formData.put("remark", userService.selectUserById(userId).getRemark());
106
         formData.put("entryDate", userService.selectUserById(userId).getEntryDate());
110
         formData.put("entryDate", userService.selectUserById(userId).getEntryDate());
107
         formData.put("age", userService.selectUserById(userId).getAge());
111
         formData.put("age", userService.selectUserById(userId).getAge());
162
                 cmcAssess.setOtherWork(formDataJson.getString(key));
166
                 cmcAssess.setOtherWork(formDataJson.getString(key));
163
             if (key.equals("selfAssess"))
167
             if (key.equals("selfAssess"))
164
                 cmcAssess.setSelfAssess(formDataJson.getString(key));
168
                 cmcAssess.setSelfAssess(formDataJson.getString(key));
165
-            if (key.startsWith("role") && !Objects.equals(formDataJson.get(key), new JSONArray())) {
169
+            //必填项
170
+            if (key.length() == 5 && key.startsWith("f") && !formDataJson.get(key).equals("")) {
171
+                CmcAssessContentWork cmcAssessContentWork = new CmcAssessContentWork();
172
+                cmcAssessContentWork.setWorkId(cmcAssess.getAssessId() + key.substring(1));
173
+                cmcAssessContentWork.setWorkLoad(formDataJson.getString(key));
174
+                cmcAssessContentWorkService.insertCmcAssessContentWork(cmcAssessContentWork);
166
                 CmcAssessContent cmcAssessContent = new CmcAssessContent();
175
                 CmcAssessContent cmcAssessContent = new CmcAssessContent();
167
-                cmcAssessContent.setContentId(cmcAssess.getAssessId() + key.substring(4));
176
+                cmcAssessContent.setContentId(cmcAssess.getAssessId() + key.substring(3));
177
+                cmcAssessContentService.insertCmcAssessContent(cmcAssessContent);
178
+            }
179
+            if (key.startsWith("role") && !Objects.equals(formDataJson.get(key), new JSONArray())) {
168
                 StringBuilder roles = new StringBuilder();
180
                 StringBuilder roles = new StringBuilder();
169
                 for (int i = 0; i < formDataJson.getJSONArray(key).size(); i++) {
181
                 for (int i = 0; i < formDataJson.getJSONArray(key).size(); i++) {
170
                     String rolei = "";
182
                     String rolei = "";
174
                         rolei = formDataJson.getJSONArray(key).getString(i) + ",";
186
                         rolei = formDataJson.getJSONArray(key).getString(i) + ",";
175
                     roles.append(rolei);
187
                     roles.append(rolei);
176
                 }
188
                 }
189
+                CmcAssessContent cmcAssessContent = cmcAssessContentService.selectCmcAssessContentByContentId(cmcAssess.getAssessId() + key.substring(4)).get(0);
177
                 cmcAssessContent.setRole(roles.toString());
190
                 cmcAssessContent.setRole(roles.toString());
178
-                cmcAssessContentService.insertCmcAssessContent(cmcAssessContent);
179
-            }
180
-            if (key.length() == 5 && key.startsWith("f") && !formDataJson.get(key).equals("")) {
181
-                CmcAssessContentWork cmcAssessContentWork = new CmcAssessContentWork();
182
-                cmcAssessContentWork.setWorkId(cmcAssess.getAssessId() + key.substring(1));
183
-                cmcAssessContentWork.setWorkLoad(formDataJson.getString(key));
184
-                cmcAssessContentWorkService.insertCmcAssessContentWork(cmcAssessContentWork);
191
+                cmcAssessContentService.updateCmcAssessContent(cmcAssessContent);
185
             }
192
             }
186
             if (key.startsWith("familiar")) {
193
             if (key.startsWith("familiar")) {
187
                 CmcAssessContent cmcAssessContent = cmcAssessContentService.selectCmcAssessContentByContentId(cmcAssess.getAssessId() + key.substring(8)).get(0);
194
                 CmcAssessContent cmcAssessContent = cmcAssessContentService.selectCmcAssessContentByContentId(cmcAssess.getAssessId() + key.substring(8)).get(0);

+ 6
- 1
oa-ui/src/views/system/user/index.vue Просмотреть файл

273
         </el-row>
273
         </el-row>
274
         <el-row>
274
         <el-row>
275
           <el-col :span="12">
275
           <el-col :span="12">
276
-            <el-form-item label="技术职称" prop="titles">
276
+            <el-form-item label="技术职称">
277
               <el-select v-model="form.titles" multiple placeholder="请输入技术职称">
277
               <el-select v-model="form.titles" multiple placeholder="请输入技术职称">
278
                 <el-option
278
                 <el-option
279
                   v-for="dict in dict.type.sys_user_titles"
279
                   v-for="dict in dict.type.sys_user_titles"
437
       postOptions: [],
437
       postOptions: [],
438
       // 角色选项
438
       // 角色选项
439
       roleOptions: [],
439
       roleOptions: [],
440
+      titles: [],
440
       // 表单参数
441
       // 表单参数
441
       form: {},
442
       form: {},
442
       pm: false,
443
       pm: false,
635
         this.roleOptions = response.roles;
636
         this.roleOptions = response.roles;
636
         this.$set(this.form, "postIds", response.postIds);
637
         this.$set(this.form, "postIds", response.postIds);
637
         this.$set(this.form, "roleIds", response.roleIds);
638
         this.$set(this.form, "roleIds", response.roleIds);
639
+        for (let i = 0; i < response.data.titles.split(",").length; i++)
640
+          this.titles[i] = response.data.titles.split(",")[i]
641
+        this.$set(this.form, "titles", this.titles);
638
         this.open = true;
642
         this.open = true;
639
         this.title = "修改用户";
643
         this.title = "修改用户";
640
         this.form.password = "";
644
         this.form.password = "";
664
       this.$refs["form"].validate(valid => {
668
       this.$refs["form"].validate(valid => {
665
         if (valid) {
669
         if (valid) {
666
           if (this.form.userId != undefined) {
670
           if (this.form.userId != undefined) {
671
+            this.form.titles = this.form.titles.join(',')
667
             updateUser(this.form).then(response => {
672
             updateUser(this.form).then(response => {
668
               this.$modal.msgSuccess("修改成功");
673
               this.$modal.msgSuccess("修改成功");
669
               this.open = false;
674
               this.open = false;

Загрузка…
Отмена
Сохранить