Browse Source

项目成员接口改变

yumeng 5 năm trước cách đây
mục cha
commit
c1f5a9ca1a

+ 13 - 4
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/ProjectMemberController.java

@@ -20,6 +20,8 @@ import org.jeecg.modules.ctop.entity.ProjectMember;
 import org.jeecg.modules.ctop.mapper.ProjectMemberMapper;
 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;
@@ -58,6 +60,8 @@ public class ProjectMemberController {
     private IProjectService projectService;
     @Autowired
     private MaterialReportMapper materialReportMapper;
+    @Autowired
+    private ISysUserService sysUserService;
 
 
     /**
@@ -168,6 +172,8 @@ public class ProjectMemberController {
      * @param jsonObject
      * @return
      */
+
+
     @AutoLog(value = "项目成员-添加")
     @ApiOperation(value = "项目成员-添加", notes = "项目成员-添加")
     @PostMapping(value = "/batchAdd")
@@ -184,9 +190,8 @@ public class ProjectMemberController {
                 throw new Exception("请选择项目成员");
             }
             for (int i = 0; i < memberArr.size(); i++) {
-                JSONObject memberJson = memberArr.getJSONObject(i);
-                if (!Check.isNull(memberJson)) {
-                    String userId = memberJson.getString("userId");
+                String userId = memberArr.get(i).toString();
+                if (!Check.isNull(userId)) {
                     QueryWrapper<ProjectMember> queryWrapper = new QueryWrapper<>();
                     queryWrapper.eq("user_id", userId);
                     queryWrapper.eq("project_id", projectId);
@@ -202,7 +207,11 @@ public class ProjectMemberController {
                     member.setProjectId(projectId);
                     member.setProjectName(projectName);
                     member.setUserId(userId);
-                    member.setUserName(memberJson.getString("userName"));
+                    SysUser sysUser = sysUserService.getById(userId);
+                    if (!Check.isNull(sysUser)) {
+                        member.setUserName(sysUser.getRealname());
+                    }
+
                     projectMemberService.save(member);
                 }
             }