10/20

yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationService.java

@@ -137,25 +137,11 @@ public class ProjectInformationService extends MybatisBaseService<ProjectInforma
         }
         //关联章证
         if (dto.getIdCardList().size() > 0) {
-            List<Map<String, String>> maps = new ArrayList<>();
             for (ProjectZzFilesDto projectZzFilesDto : dto.getIdCardList()) {
-                String[] zzFile = projectZzFilesDto.getUrls();
-                if (zzFile != null) {
-                    for (String s : zzFile) {
-                        Map<String, String> m = new HashMap<>();
-                        m.put("projectSid", projectSid);
-                        m.put("enterpriseSid", projectZzFilesDto.getEnterpriseSid());
-                        m.put("url", s);
-                        m.put("sid", UUID.randomUUID().toString());
-                        m.put("idCardType", projectZzFilesDto.getIdCardType());
-                        m.put("idCardName", projectZzFilesDto.getIdCardName());
-                        maps.add(m);
-                    }
-                }
-            }
-            if (maps.size() > 0) {
-                projectZzFilesService.insertFiles(maps);
+                projectZzFilesDto.setProjectSid(projectSid);
             }
+            projectZzFilesService.insertFiles(dto.getIdCardList());
+
         }else{
             projectZzFilesService.deleteByProjectSid(projectSid);
         }
@@ -270,32 +256,19 @@ public class ProjectInformationService extends MybatisBaseService<ProjectInforma
             List<EnterpriseProjectVo> enterpriseProjectVoList = enterpriseProjectService.getEnterpriseByProjectSid(sid);
             projectInfoVo.setEnterpriseList(enterpriseProjectVoList);
             //章证
-            List<ProjectZzFilesVo> zzFilesVos = new ArrayList<>();
-            enterpriseProjectVoList.forEach(s -> {
-                ProjectZzFilesVo projectZzFilesVo = new ProjectZzFilesVo();
-                List<Map<String,String>> maps =new ArrayList<>();
-                List<ProjectZzFilesVo> projectZzFilesVos = projectZzFilesService.getZzFilesByProjectSid(bank.getSid(), s.getEnterpriseSid()).getData();
-                if (projectZzFilesVos.size() != 0) {
-                    projectZzFilesVos.forEach(j -> {
+            List<ProjectZzFilesVo> projectZzFilesVos = projectZzFilesService.getZzFilesByProjectSid(bank.getSid()).getData();
+            if (projectZzFilesVos.size() != 0) {
+                projectZzFilesVos.forEach(j -> {
+                    List<Map<String,String>> maps =new ArrayList<>();
+                    for(String r:j.getUrl().split(",")){
                         Map<String,String> map=new HashMap<>();
-                        map.put("url",j.getUrl());
-//                        if (StringUtils.isEmpty(projectZzFilesVo.getUrl())) {
-//                            projectZzFilesVo.setUrl(j.getUrl());
-//                        } else {
-//                            projectZzFilesVo.setUrl(projectZzFilesVo.getUrl() + "," + j.getUrl());
-//                        }
+                        map.put("url",r);
                         maps.add(map);
-                    });
-                    projectZzFilesVo.setProjectSid(projectZzFilesVos.get(0).getProjectSid());
-                    projectZzFilesVo.setEnterpriseSid(projectZzFilesVos.get(0).getEnterpriseSid());
-                    projectZzFilesVo.setIdCardType(projectZzFilesVos.get(0).getIdCardType());
-                    projectZzFilesVo.setIdCardName(projectZzFilesVos.get(0).getIdCardName());
-                    projectZzFilesVo.setEnterpriseName(projectZzFilesVos.get(0).getEnterpriseName());
-                    projectZzFilesVo.setUrls(maps);
-                    zzFilesVos.add(projectZzFilesVo);
-                }
-            });
-            projectInfoVo.setIdCardList(zzFilesVos);
+                    }
+                    j.setUrls(maps);
+                });
+            }
+            projectInfoVo.setIdCardList(projectZzFilesVos);
             //账户
             List<ProjectAccountVo> ProjectAccountVos = projectAccountService.getAccountByProjectSid(bank.getSid()).getData();
             projectInfoVo.setBankList(ProjectAccountVos);

yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectzzfiles/ProjectZzFiles.java

@@ -1,5 +1,6 @@
 package com.yxt.supervise.crm.biz.projectzzfiles;
 
+import cn.hutool.core.util.IdUtil;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.yxt.common.core.domain.BaseEntity;
 import com.yxt.common.core.domain.EntityWithId;
@@ -14,7 +15,7 @@ import lombok.Data;
 @ApiModel(value = "项目章证关联", description = "项目章证关联")
 @TableName("project_zz_files")
 public class ProjectZzFiles extends EntityWithId {
-    private String sid;
+    private String sid= IdUtil.fastSimpleUUID();
     private String url;
     private String projectSid;
     private String enterpriseSid;

yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectzzfiles/ProjectZzFilesMapper.java

@@ -22,7 +22,7 @@ public interface ProjectZzFilesMapper extends BaseMapper<ProjectZzFiles> {
     void insertFiles(List<Map<String, String>> maps);
     @Select("select * from project_state_dictionary where sid=#{sid}")
     ProjectZzFilesVo getProjectStateBySid(@Param("sid")String sid);
-    @Select("select p.*,e.enterpriseName as enterpriseName from project_zz_files p left join enterprise_information e on e.sid =p.enterpriseSid where projectSid=#{projectSid} and enterpriseSid=#{enterpriseSid}")
-    List<ProjectZzFilesVo> getZzFilesByProjectSid(@Param("projectSid")String projectSid,@Param("enterpriseSid")String enterpriseSid);
+    @Select("select p.*,e.enterpriseName as enterpriseName from project_zz_files p left join enterprise_information e on e.sid =p.enterpriseSid where projectSid=#{projectSid}")
+    List<ProjectZzFilesVo> getZzFilesByProjectSid(@Param("projectSid")String projectSid);
 
 }

yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectzzfiles/ProjectZzFilesService.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
+import com.yxt.common.base.utils.StringUtils;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -38,15 +39,27 @@ public class ProjectZzFilesService extends MybatisBaseService<ProjectZzFilesMapp
         PagerVo<ProjectZzFilesVo> p = PagerUtil.pageToVo(pagging, null);
         return p;
     }
-    public ResultBean insertFiles(List<Map<String, String>> maps) {
+    public ResultBean insertFiles(List<ProjectZzFilesDto> dtos) {
         ResultBean rb=new ResultBean();
         //
-        for(Map<String, String> map: maps){
-            baseMapper.delete(new QueryWrapper<ProjectZzFiles>().eq("projectSid",map.get("projectSid").toString()).eq("enterpriseSid",map.get("enterpriseSid")));
+        for(ProjectZzFilesDto dto: dtos){
+            baseMapper.delete(new QueryWrapper<ProjectZzFiles>().eq("projectSid",dto.getProjectSid()).eq("enterpriseSid",dto.getEnterpriseSid()));
+        }
+        ProjectZzFiles entity=new ProjectZzFiles();
+        for(ProjectZzFilesDto dto: dtos){
+            BeanUtil.copyProperties(dto, entity, "id", "sid");
+            for(String d:dto.getUrls()){
+                if(StringUtils.isBlank(entity.getUrl())){
+                    entity.setUrl(d);
+                }else{
+                    entity.setUrl(entity.getUrl()+","+d);
+                }
+            }
+            baseMapper.insert(entity);
         }
-        baseMapper.insertFiles(maps);
         return rb.success();
     }
+
     public ResultBean save(ProjectZzFilesDto dto) {
         ResultBean rb=new ResultBean();
         ProjectZzFiles entity=new ProjectZzFiles();
@@ -79,9 +92,9 @@ public class ProjectZzFilesService extends MybatisBaseService<ProjectZzFilesMapp
         return rb.success().setData(projectStateBySid);
     }
 
-    public ResultBean<List<ProjectZzFilesVo>> getZzFilesByProjectSid(String projectSid,String enterpriseSid) {
+    public ResultBean<List<ProjectZzFilesVo>> getZzFilesByProjectSid(String projectSid ) {
         ResultBean rb=new ResultBean();
-        List<ProjectZzFilesVo> projectStateBySids=baseMapper.getZzFilesByProjectSid(projectSid,enterpriseSid);
+        List<ProjectZzFilesVo> projectStateBySids=baseMapper.getZzFilesByProjectSid(projectSid);
         return rb.success().setData(projectStateBySids);
     }
 }

yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysuser/SysUserService.java

@@ -233,6 +233,9 @@ public class SysUserService extends MybatisBaseService<SysUserMapper, SysUser> {
     }
     public SysUser getUserBySid(String sid) {
         SysUser entity = this.fetchBySid(sid);
+        if(null==entity){
+            return new SysUser();
+        }
         SysStaffinfo sysStaffinfo=sysStaffinfoService.fetchBySid(entity.getStaffSid());
         List<SysUserRole> s=userRoleService.list(new QueryWrapper<SysUserRole>().eq("userSid",sid));
         List<String> roles=new ArrayList<>();
@@ -242,7 +245,9 @@ public class SysUserService extends MybatisBaseService<SysUserMapper, SysUser> {
                 roles.add(sysRole.getName());
             }
         }
-        entity.setName(sysStaffinfo.getName());
+        if(null!=sysStaffinfo){
+            entity.setName(sysStaffinfo.getName());
+        }
         entity.setRoleNames(roles);
         return entity;
     }