yumeng 5 gadi atpakaļ
vecāks
revīzija
74ca8645da

+ 19 - 2
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/ProjectController.java

@@ -21,6 +21,8 @@ import org.jeecg.modules.ctop.mapper.ProjectMapper;
 import org.jeecg.modules.ctop.service.IAdvertiserService;
 import org.jeecg.modules.ctop.service.IProjectMemberService;
 import org.jeecg.modules.ctop.service.IProjectService;
+import org.jeecg.modules.system.entity.SysUser;
+import org.jeecg.modules.system.service.ISysUserService;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
@@ -152,6 +154,9 @@ public class ProjectController {
      * @param project
      * @return
      */
+    @Autowired
+    private ISysUserService sysUserService;
+
     @AutoLog(value = "项目-添加")
     @ApiOperation(value = "项目-添加", notes = "项目-添加")
     @PostMapping(value = "/add")
@@ -163,6 +168,10 @@ public class ProjectController {
             if (!Check.isNull(advertiser)) {
                 project.setCompanyId(advertiser.getCompanyId());
             }
+            SysUser sysUser = sysUserService.getById(project.getResponsibleId());
+            if (!Check.isNull(sysUser)) {
+                project.setResponsibleName(sysUser.getRealname());
+            }
             projectService.save(project);
             Long id = project.getId();
             Map<String, Object> map = new HashMap<>();
@@ -173,7 +182,9 @@ public class ProjectController {
             member.setProjectId(id);
             member.setProjectName(project.getProjectName());
             member.setUserId(project.getResponsibleId());
-            member.setUserName(project.getResponsibleName());
+            if (!Check.isNull(sysUser)) {
+                member.setUserName(sysUser.getRealname());
+            }
             String roleCode = materialReportMapper.getRoleCodeByUserId(project.getUserId());
             if (!Check.isNull(roleCode)) {
                 member.setRoleCode(roleCode);
@@ -181,7 +192,7 @@ public class ProjectController {
             projectMemberService.save(member);
             result.success("添加成功!");
         } catch (Exception e) {
-            log.error(e.getMessage(), e);
+            e.printStackTrace();
             result.error500("操作失败");
         }
         return result;
@@ -198,6 +209,12 @@ public class ProjectController {
     @PutMapping(value = "/edit")
     public Result<Project> edit(@RequestBody Project project) {
         Result<Project> result = new Result<Project>();
+
+        SysUser sysUser = sysUserService.getById(project.getResponsibleId());
+        if (!Check.isNull(sysUser)) {
+            project.setResponsibleName(sysUser.getRealname());
+        }
+
         Project projectEntity = projectService.getById(project.getId());
         if (projectEntity == null) {
             result.error500("未找到对应实体");