回传formdata对象判空

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

@@ -170,37 +170,39 @@ public class CmcAssessController extends BaseController
             }
         }
         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++) {
-                    String rolei = "";
-                    if (i == formDataJson.getJSONArray(key).size() - 1)
-                        rolei = formDataJson.getJSONArray(key).getString(i);
-                    else
-                        rolei = formDataJson.getJSONArray(key).getString(i) + ",";
-                    roles.append(rolei);
+            if (formDataJson.get(key) != null) {
+                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++) {
+                        String rolei = "";
+                        if (i == formDataJson.getJSONArray(key).size() - 1)
+                            rolei = formDataJson.getJSONArray(key).getString(i);
+                        else
+                            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.updateCmcAssessContent(cmcAssessContent);
+                }
+                if (key.startsWith("familiar")) {
+                    CmcAssessContent cmcAssessContent = cmcAssessContentService.selectCmcAssessContentByContentId(cmcAssess.getAssessId() + key.substring(8)).get(0);
+                    cmcAssessContent.setFamiliar(formDataJson.getString(key));
+                    cmcAssessContentService.updateCmcAssessContent(cmcAssessContent);
+                }
+                if (key.startsWith("remark") && key.length() > 6) {
+                    CmcAssessContent cmcAssessContent = cmcAssessContentService.selectCmcAssessContentByContentId(cmcAssess.getAssessId() + key.substring(6)).get(0);
+                    cmcAssessContent.setRemark(formDataJson.getString(key));
+                    cmcAssessContentService.updateCmcAssessContent(cmcAssessContent);
                 }
-                CmcAssessContent cmcAssessContent = cmcAssessContentService.selectCmcAssessContentByContentId(cmcAssess.getAssessId() + key.substring(4)).get(0);
-                cmcAssessContent.setRole(roles.toString());
-                cmcAssessContentService.updateCmcAssessContent(cmcAssessContent);
-            }
-            if (key.startsWith("familiar")) {
-                CmcAssessContent cmcAssessContent = cmcAssessContentService.selectCmcAssessContentByContentId(cmcAssess.getAssessId() + key.substring(8)).get(0);
-                cmcAssessContent.setFamiliar(formDataJson.getString(key));
-                cmcAssessContentService.updateCmcAssessContent(cmcAssessContent);
-            }
-            if (key.startsWith("remark") && key.length() > 6) {
-                CmcAssessContent cmcAssessContent = cmcAssessContentService.selectCmcAssessContentByContentId(cmcAssess.getAssessId() + key.substring(6)).get(0);
-                cmcAssessContent.setRemark(formDataJson.getString(key));
-                cmcAssessContentService.updateCmcAssessContent(cmcAssessContent);
             }
         }
         cmcAssessService.updateCmcAssess(cmcAssess);
@@ -254,67 +256,69 @@ public class CmcAssessController extends BaseController
                 cmcAssessContentWorkService.deleteCmcAssessContentWorkByWorkId(id);
         }
         for (String key : formDataJson.keySet()) {
-            if (key.startsWith("role") && !Objects.equals(formDataJson.get(key), new JSONArray())) {
-                CmcAssessContent cmcAssessContent = cmcAssessContentService.selectCmcAssessContentByContentId(formDataJson.getString("assessId") + key.substring(4)).get(0);
-                StringBuilder roles = new StringBuilder();
-                for (int i = 0; i < formDataJson.getJSONArray(key).size(); i++) {
-                    String rolei = "";
-                    if (i == formDataJson.getJSONArray(key).size() - 1)
-                        rolei = formDataJson.getJSONArray(key).getString(i);
-                    else
-                        rolei = formDataJson.getJSONArray(key).getString(i) + ",";
-                    roles.append(rolei);
+            if (formDataJson.get(key) != null) {
+                if (key.startsWith("role") && !Objects.equals(formDataJson.get(key), new JSONArray())) {
+                    CmcAssessContent cmcAssessContent = cmcAssessContentService.selectCmcAssessContentByContentId(formDataJson.getString("assessId") + key.substring(4)).get(0);
+                    StringBuilder roles = new StringBuilder();
+                    for (int i = 0; i < formDataJson.getJSONArray(key).size(); i++) {
+                        String rolei = "";
+                        if (i == formDataJson.getJSONArray(key).size() - 1)
+                            rolei = formDataJson.getJSONArray(key).getString(i);
+                        else
+                            rolei = formDataJson.getJSONArray(key).getString(i) + ",";
+                        roles.append(rolei);
+                    }
+                    cmcAssessContent.setRole(roles.toString());
+                    cmcAssessContentService.updateCmcAssessContent(cmcAssessContent);
                 }
-                cmcAssessContent.setRole(roles.toString());
-                cmcAssessContentService.updateCmcAssessContent(cmcAssessContent);
-            }
-            if (key.length() == 5 && key.startsWith("f") && !formDataJson.get(key).equals("")) {
-                List<CmcAssessContentWork> cmcAssessContentWorkList = cmcAssessContentWorkService.selectCmcAssessContentWorkByWorkId(formDataJson.getString("assessId") + key.substring(1));
-                if (cmcAssessContentWorkList.size() > 0) { //某项考核工作更改工作量
-                    cmcAssessContentWorkList.get(0).setWorkLoad(formDataJson.getString(key));
-                    cmcAssessContentWorkService.updateCmcAssessContentWork(cmcAssessContentWorkList.get(0));
+                if (key.length() == 5 && key.startsWith("f") && !formDataJson.get(key).equals("")) {
+                    List<CmcAssessContentWork> cmcAssessContentWorkList = cmcAssessContentWorkService.selectCmcAssessContentWorkByWorkId(formDataJson.getString("assessId") + key.substring(1));
+                    if (cmcAssessContentWorkList.size() > 0) { //某项考核工作更改工作量
+                        cmcAssessContentWorkList.get(0).setWorkLoad(formDataJson.getString(key));
+                        cmcAssessContentWorkService.updateCmcAssessContentWork(cmcAssessContentWorkList.get(0));
+                    }
+                    else { //新增一项考核工作
+                        CmcAssessContentWork cmcAssessContentWork = new CmcAssessContentWork();
+                        cmcAssessContentWork.setWorkId(formDataJson.getString("assessId") + key.substring(1));
+                        cmcAssessContentWork.setWorkLoad(formDataJson.getString(key));
+                        cmcAssessContentWorkService.insertCmcAssessContentWork(cmcAssessContentWork);
+                    }
                 }
-                else { //新增一项考核工作
-                    CmcAssessContentWork cmcAssessContentWork = new CmcAssessContentWork();
-                    cmcAssessContentWork.setWorkId(formDataJson.getString("assessId") + key.substring(1));
-                    cmcAssessContentWork.setWorkLoad(formDataJson.getString(key));
-                    cmcAssessContentWorkService.insertCmcAssessContentWork(cmcAssessContentWork);
+                if (key.startsWith("familiar")) {
+                    CmcAssessContent cmcAssessContent = cmcAssessContentService.selectCmcAssessContentByContentId(formDataJson.getString("assessId") + key.substring(8)).get(0);
+                    cmcAssessContent.setFamiliar(formDataJson.getString(key));
+                    cmcAssessContentService.updateCmcAssessContent(cmcAssessContent);
+                }
+                if (key.startsWith("remark") && key.length() > 6) {
+                    CmcAssessContent cmcAssessContent = cmcAssessContentService.selectCmcAssessContentByContentId(formDataJson.getString("assessId") + key.substring(6)).get(0);
+                    cmcAssessContent.setRemark(formDataJson.getString(key));
+                    cmcAssessContentService.updateCmcAssessContent(cmcAssessContent);
+                }
+                if (key.startsWith("workload")) {
+                    CmcAssessContent cmcAssessContent = cmcAssessContentService.selectCmcAssessContentByContentId(formDataJson.getString("assessId") + key.substring(8)).get(0);
+                    cmcAssessContent.setWorkload(formDataJson.getString(key));
+                    cmcAssessContentService.updateCmcAssessContent(cmcAssessContent);
+                }
+                if (key.startsWith("skill")) {
+                    CmcAssessContent cmcAssessContent = cmcAssessContentService.selectCmcAssessContentByContentId(formDataJson.getString("assessId") + key.substring(5)).get(0);
+                    cmcAssessContent.setSkill(formDataJson.getString(key));
+                    cmcAssessContentService.updateCmcAssessContent(cmcAssessContent);
+                }
+                if (key.startsWith("quality")) {
+                    CmcAssessContent cmcAssessContent = cmcAssessContentService.selectCmcAssessContentByContentId(formDataJson.getString("assessId") + key.substring(7)).get(0);
+                    cmcAssessContent.setQuality(formDataJson.getString(key));
+                    cmcAssessContentService.updateCmcAssessContent(cmcAssessContent);
+                }
+                if (key.startsWith("assessment")) {
+                    CmcAssessContent cmcAssessContent = cmcAssessContentService.selectCmcAssessContentByContentId(formDataJson.getString("assessId") + key.substring(10)).get(0);
+                    cmcAssessContent.setAssessment(formDataJson.getString(key));
+                    cmcAssessContentService.updateCmcAssessContent(cmcAssessContent);
+                }
+                if (key.startsWith("advice")) {
+                    CmcAssessContent cmcAssessContent = cmcAssessContentService.selectCmcAssessContentByContentId(formDataJson.getString("assessId") + key.substring(6)).get(0);
+                    cmcAssessContent.setAdvice(formDataJson.getString(key));
+                    cmcAssessContentService.updateCmcAssessContent(cmcAssessContent);
                 }
-            }
-            if (key.startsWith("familiar")) {
-                CmcAssessContent cmcAssessContent = cmcAssessContentService.selectCmcAssessContentByContentId(formDataJson.getString("assessId") + key.substring(8)).get(0);
-                cmcAssessContent.setFamiliar(formDataJson.getString(key));
-                cmcAssessContentService.updateCmcAssessContent(cmcAssessContent);
-            }
-            if (key.startsWith("remark") && key.length() > 6) {
-                CmcAssessContent cmcAssessContent = cmcAssessContentService.selectCmcAssessContentByContentId(formDataJson.getString("assessId") + key.substring(6)).get(0);
-                cmcAssessContent.setRemark(formDataJson.getString(key));
-                cmcAssessContentService.updateCmcAssessContent(cmcAssessContent);
-            }
-            if (key.startsWith("workload")) {
-                CmcAssessContent cmcAssessContent = cmcAssessContentService.selectCmcAssessContentByContentId(formDataJson.getString("assessId") + key.substring(8)).get(0);
-                cmcAssessContent.setWorkload(formDataJson.getString(key));
-                cmcAssessContentService.updateCmcAssessContent(cmcAssessContent);
-            }
-            if (key.startsWith("skill")) {
-                CmcAssessContent cmcAssessContent = cmcAssessContentService.selectCmcAssessContentByContentId(formDataJson.getString("assessId") + key.substring(5)).get(0);
-                cmcAssessContent.setSkill(formDataJson.getString(key));
-                cmcAssessContentService.updateCmcAssessContent(cmcAssessContent);
-            }
-            if (key.startsWith("quality")) {
-                CmcAssessContent cmcAssessContent = cmcAssessContentService.selectCmcAssessContentByContentId(formDataJson.getString("assessId") + key.substring(7)).get(0);
-                cmcAssessContent.setQuality(formDataJson.getString(key));
-                cmcAssessContentService.updateCmcAssessContent(cmcAssessContent);
-            }
-            if (key.startsWith("assessment")) {
-                CmcAssessContent cmcAssessContent = cmcAssessContentService.selectCmcAssessContentByContentId(formDataJson.getString("assessId") + key.substring(10)).get(0);
-                cmcAssessContent.setAssessment(formDataJson.getString(key));
-                cmcAssessContentService.updateCmcAssessContent(cmcAssessContent);
-            }
-            if (key.startsWith("advice")) {
-                CmcAssessContent cmcAssessContent = cmcAssessContentService.selectCmcAssessContentByContentId(formDataJson.getString("assessId") + key.substring(6)).get(0);
-                cmcAssessContent.setAdvice(formDataJson.getString(key));
-                cmcAssessContentService.updateCmcAssessContent(cmcAssessContent);
             }
         }
         cmcAssessService.updateCmcAssess(cmcAssess);