yumeng 4 年 前
コミット
0686e853ae

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

@@ -2,10 +2,7 @@ package org.jeecg.modules.ctop.controller;
 
 import cn.com.ctop.common.module.annotation.AutoLog;
 import cn.com.ctop.common.module.constant.CtopRoleCodeConstant;
-import cn.com.ctop.common.module.entity.Advertiser;
-import cn.com.ctop.common.module.entity.MaterialInfo;
-import cn.com.ctop.common.module.entity.Project;
-import cn.com.ctop.common.module.entity.SupplierList;
+import cn.com.ctop.common.module.entity.*;
 import cn.com.ctop.common.module.mapper.ProjectMapper;
 import cn.com.ctop.common.module.service.*;
 import cn.com.ctop.common.module.utils.Check;
@@ -312,18 +309,17 @@ public class ProjectController {
                 project.setIndustryCode(category.getCode());
                 project.setIndustryId(category.getId());
             }*/
-           /* SysUser sysUser = sysUserService.getById(project.getResponsibleId());
+            SysUser sysUser = sysUserService.getById(project.getResponsibleId());
             if (!Check.isNull(sysUser)) {
-                project.setResponsibleName(sysUser.getRealname());
+                //  project.setResponsibleName(sysUser.getRealname());
                 memberMap.put(sysUser.getId(), sysUser.getRealname());
-            }*/
+            }
 
-           /* SysUser designSysUser = sysUserService.getById(project.getDesignResponsibleId());
+            SysUser designSysUser = sysUserService.getById(project.getDesignResponsibleId());
             if (!Check.isNull(designSysUser)) {
-                project.setDesignResponsibleName(designSysUser.getRealname());
+                // project.setDesignResponsibleName(designSysUser.getRealname());
                 memberMap.put(designSysUser.getId(), designSysUser.getRealname());
             }
-*/
             projectService.save(project);
 
             Long id = project.getId();
@@ -368,22 +364,22 @@ public class ProjectController {
     @PutMapping(value = "/edit")
     public Result<Project> edit(@RequestBody Project project) {
         Result<Project> result = new Result<>();
-       /* SysUser sysUser = sysUserService.getById(project.getResponsibleId());
+        SysUser sysUser = sysUserService.getById(project.getResponsibleId());
         if (!Check.isNull(sysUser)) {
-            project.setResponsibleName(sysUser.getRealname());
+            //     project.setResponsibleName(sysUser.getRealname());
             projectMemberService.addMember(sysUser, project);
-        }*/
+        }
 
        /* SysCategory category = sysCategoryService.getById(project.getIndustryId());
         if (null != category) {
             project.setIndustryCode(category.getCode());
             project.setIndustryId(category.getId());
         }*/
-       /* SysUser designSysUser = sysUserService.getById(project.getDesignResponsibleId());
+        SysUser designSysUser = sysUserService.getById(project.getDesignResponsibleId());
         if (!Check.isNull(designSysUser)) {
-            project.setDesignResponsibleName(designSysUser.getRealname());
+            //      project.setDesignResponsibleName(designSysUser.getRealname());
             projectMemberService.addMember(designSysUser, project);
-        }*/
+        }
         Project projectEntity = projectService.getById(project.getId());
         if (projectEntity == null) {
             result.error500("未找到对应实体");