编辑方法修改

src/main/java/com/hz/employmentsite/controller/baseSettings/InstitutionController.java

@@ -5,6 +5,7 @@ import com.hz.employmentsite.filter.exception.BaseResponse;
 import com.hz.employmentsite.filter.exception.RespGenerstor;
 import com.hz.employmentsite.model.SelectProps;
 import com.hz.employmentsite.util.ExcelHelper;
+import com.hz.employmentsite.vo.companyService.CompanyVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import com.hz.employmentsite.services.service.baseSettings.InstitutionService;
@@ -42,14 +43,13 @@ public class InstitutionController {
 
     @GetMapping("get")
     public BaseResponse<InstitutionVo> get(@RequestParam(required = false) String institutionID) {
-        InstitutionVo dataModel = new InstitutionVo();
-        if (institutionID == null || institutionID == ""){
-            dataModel.institutionID = UUID.randomUUID().toString();
-        }else{
-            dataModel = institutionService.get(institutionID);
+        var data = institutionService.get(institutionID);
+        if (data == null) {
+            data = new InstitutionVo();
+            data.institutionID = UUID.randomUUID().toString();
         }
-        dataModel.manageSites = null;
-        return RespGenerstor.success(dataModel);
+        data.manageSites = null;
+        return RespGenerstor.success(data);
     }
 
     @ResponseBody

src/main/java/com/hz/employmentsite/controller/baseSettings/SiteInfoController.java

@@ -5,6 +5,7 @@ import com.hz.employmentsite.filter.exception.BaseResponse;
 import com.hz.employmentsite.filter.exception.RespGenerstor;
 import com.hz.employmentsite.model.SelectProps;
 import com.hz.employmentsite.util.ExcelHelper;
+import com.hz.employmentsite.vo.baseSettings.InstitutionVo;
 import com.hz.employmentsite.vo.baseSettings.SiteInfoVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -55,14 +56,12 @@ public class SiteInfoController {
 
     @GetMapping("get")
     public BaseResponse<SiteInfoVo> get(@RequestParam(required = false) String siteID) {
-        SiteInfoVo dataModel = new SiteInfoVo();
-        if (siteID == null || siteID == ""){
-            dataModel.siteID = UUID.randomUUID().toString();
-        }else{
-            dataModel = siteInfoService.get(siteID);
+        var data = siteInfoService.get(siteID);
+        if (data == null) {
+            data = new SiteInfoVo();
+            data.siteID  = UUID.randomUUID().toString();
         }
-        dataModel.manageUsers = null;
-        return RespGenerstor.success(dataModel);
+        return RespGenerstor.success(data);
     }
 
 

src/main/java/com/hz/employmentsite/controller/baseSettings/SiteUserController.java

@@ -7,6 +7,7 @@ import com.hz.employmentsite.model.SelectProps;
 import com.hz.employmentsite.services.service.AccountService;
 import com.hz.employmentsite.services.service.baseSettings.SiteUserService;
 import com.hz.employmentsite.util.ExcelHelper;
+import com.hz.employmentsite.vo.baseSettings.SiteInfoVo;
 import com.hz.employmentsite.vo.baseSettings.SiteUserVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -50,13 +51,12 @@ public class SiteUserController {
 
     @GetMapping("get")
     public BaseResponse<SiteUserVo> get(@RequestParam(required = false) String siteUserID) {
-        SiteUserVo dataModel = new SiteUserVo();
-        if (siteUserID == null || siteUserID == ""){
-            dataModel.siteUserID = UUID.randomUUID().toString();
-        }else{
-            dataModel = userInfoService.get(siteUserID);
+        var data =  userInfoService.get(siteUserID);
+        if (data == null) {
+            data = new SiteUserVo();
+            data.siteUserID = UUID.randomUUID().toString();
         }
-        return RespGenerstor.success(dataModel);
+        return RespGenerstor.success(data);
     }
 
     @ResponseBody

src/main/java/com/hz/employmentsite/controller/jobUserManager/JobHuntController.java

@@ -7,6 +7,7 @@ import com.hz.employmentsite.filter.exception.RespGenerstor;
 import com.hz.employmentsite.services.service.AccountService;
 import com.hz.employmentsite.services.service.jobUserManager.JobHuntService;
 import com.hz.employmentsite.util.ExcelHelper;
+import com.hz.employmentsite.vo.baseSettings.SiteInfoVo;
 import com.hz.employmentsite.vo.jobUserManager.JobHuntVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -51,13 +52,12 @@ public class JobHuntController {
 
     @GetMapping("get")
     public BaseResponse<JobHuntVo> get(@RequestParam(required = false) String jobHuntID) {
-        JobHuntVo dataModel = new JobHuntVo();
-        if (jobHuntID == null || jobHuntID == ""){
-            dataModel.jobHuntID = UUID.randomUUID().toString();
-        }else{
-            dataModel = jobhuntService.get(jobHuntID);
+        var data = jobhuntService.get(jobHuntID);
+        if (data == null) {
+            data = new JobHuntVo();
+            data.jobHuntID  = UUID.randomUUID().toString();
         }
-        return RespGenerstor.success(dataModel);
+        return RespGenerstor.success(data);
     }
 
     @ResponseBody

src/main/java/com/hz/employmentsite/controller/jobUserManager/JobUserController.java

@@ -46,12 +46,12 @@ public class JobUserController {
     @ResponseBody
     @GetMapping("/getDataById")
     public BaseResponse getDataById(String id) {
-        var result = jobuserService.getDataById(id);
-        if (result == null) {
-            result = new JobUserVo();
-            result.setJobUserID(UUID.randomUUID().toString());
+        var data = jobuserService.getDataById(id);
+        if (data == null) {
+            data = new JobUserVo();
+            data.setJobUserID(UUID.randomUUID().toString());
         }
-        return RespGenerstor.success(result);
+        return RespGenerstor.success(data);
     }
 
 

src/main/java/com/hz/employmentsite/controller/taskAndLog/DoWorkController.java

@@ -6,6 +6,7 @@ import com.hz.employmentsite.filter.exception.RespGenerstor;
 import com.hz.employmentsite.services.service.AccountService;
 import com.hz.employmentsite.services.service.taskAndLog.DoWorkService;
 import com.hz.employmentsite.util.ExcelHelper;
+import com.hz.employmentsite.vo.taskAndLog.DoTaskVo;
 import com.hz.employmentsite.vo.taskAndLog.DoWorkVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -40,14 +41,12 @@ public class DoWorkController {
 
     @GetMapping("get")
     public BaseResponse<DoWorkVo> get(@RequestParam(required = false) String doWorkID) {
-        DoWorkVo dataModel = new DoWorkVo();
-        if (doWorkID == null || doWorkID == ""){
-            dataModel.doWorkID = UUID.randomUUID().toString();
-            dataModel.setWorkTime(new java.sql.Date(new Date().getTime()));
-        }else{
-            dataModel = doWorkService.get(doWorkID);
+        var data = doWorkService.get(doWorkID);
+        if (data == null) {
+            data = new DoWorkVo();
+            data.doWorkID = UUID.randomUUID().toString();
         }
-        return RespGenerstor.success(dataModel);
+        return RespGenerstor.success(data);
     }
 
     @PostMapping("save")

src/main/resources/mapping/cquery/SiteInfoCQuery.xml

@@ -28,7 +28,6 @@
         <if test="streetCode!='' and streetCode!=null">
             and streetCode like Concat('%',#{streetCode},'%')
         </if>
-        group by site.SiteID
     </select>
 
     <select id="getListByInstitutionID" resultType="com.hz.employmentsite.vo.baseSettings.SiteInfoVo">

vue/src/views/jobUserManager/jobhunt/edit.vue

@@ -125,27 +125,30 @@ export default defineComponent({
 
     const getAllPostList = async function() {
       const allPostResult :any = await getList({pageIndex:1,pageSize:10000});
-      console.log('jobUserResult',allPostResult.list);
       allPostList.value = allPostResult.list;
+      console.log('allPostResult',allPostResult.list);
     }
 
     const getJobUserList = async function() {
       const jobUserResult :any = await getJobUserDataList();
-      console.log('jobUserResult',jobUserResult);
       jobUserList.value = jobUserResult;
+      console.log('jobUserResult',jobUserResult);
     }
 
     const getJobWorkTypeList = async function(){
       const data :any = await getSysDictionaryList("JobWorkType");
       jobWorkTypeList.value = data;
+      console.log('jobWorkTypeList',jobWorkTypeList.value);
     }
     const getJobHuntTypeList = async function(){
       const data :any = await getSysDictionaryList("JobHuntType");
       jobHuntTypeList.value = data;
+      console.log('jobHuntTypeList',jobHuntTypeList.value);
     }
     const getJobUserTypeList = async function(){
       const data :any = await getSysDictionaryList("JobUserType");
       jobUserTypeList.value = data;
+      console.log('jobUserTypeList',jobUserTypeList.value);
     }
 
     const loadData = (id: string) => {