xujun

science-admin/src/main/java/com/yiboshi/science/rest/v1/ComTalentApplyController.java

@@ -82,9 +82,6 @@ public class ComTalentApplyController extends BaseController<ComTalentApplyServi
     @PreAuthorize("hasAnyRole('REPORT','GOV','ADMIN')")
     @Logs(value = CommonEnum.logType.talentApply)
     public ResponseDataModel<String> save(@RequestBody ComTalentApplyDTO comTalentApplyDTO, BindingResult bindingResult) {
-        comTalentApplyDTO.setAppPersonId(SecurityUserHolder.getPersonId());
-        comTalentApplyDTO.setAppUnitId(SecurityUserHolder.getUnitId());
-
         return ResponseDataModel.ok(comTalentApplyService.save(comTalentApplyDTO));
     }
 }

science-admin/src/main/java/com/yiboshi/science/service/impl/ComPersonServiceImpl.java

@@ -513,8 +513,7 @@ public class ComPersonServiceImpl extends BaseServiceImpl<ComPersonDAO, ComPerso
     public String insertOrUpdate(ComTalentApplyDTO dto) {
         ComPerson model = new ComPerson();
         if (Objects.nonNull(dto.getPersonId())) {
-            model.setId(dto.getPersonId());
-            model = this.getEntity(model);
+            model = this.getById(dto.getPersonId());
         }
         String id = "";
         if (null == model) {

science-admin/src/main/java/com/yiboshi/science/service/impl/ComTalentApplyServiceImpl.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yiboshi.arch.exception.BusinessException;
 import com.yiboshi.science.base.BaseServiceImpl;
 import com.yiboshi.science.base.Pagination;
+import com.yiboshi.science.config.security.SecurityUserHolder;
 import com.yiboshi.science.dao.ComTalentApplyDAO;
 import com.yiboshi.science.entity.ComTalentApply;
 import com.yiboshi.science.entity.SystemParameter;
@@ -128,12 +129,16 @@ public class ComTalentApplyServiceImpl extends BaseServiceImpl<ComTalentApplyDAO
 
     public ComTalentApplyDTO getNewTalentApply() {
         ComTalentApplyDTO dto = new ComTalentApplyDTO();
-        dto.setReportYear(comBatchService.getReportYear(null, CommonEnum.timeType.talentApply.getCode()));
-        dto.setCompleteStatus("0,0,0,0,0,0");
 
         List<ComTalentBudgetDTO> bugetList = comTalentBudgetService.getList();
         dto.setBudgetList(bugetList);
 
+        dto.setReportYear(comBatchService.getReportYear(null, CommonEnum.timeType.talentApply.getCode()));
+        dto.setCompleteStatus("0,0,0,0,0,0");
+        dto.setTalentState(CommonEnum.projState.draft.getCode());
+        dto.setAppPersonId(SecurityUserHolder.getPersonId());
+        dto.setAppUnitId(SecurityUserHolder.getUnitId());
+
         return dto;
     }