Merge branch 'cr' of http://219.151.181.73:3000/zhuwei/bladex into test-merge-02

blade-service/blade-archive/src/main/java/org/springblade/archive/service/impl/ArchivesAutoServiceImpl.java

@@ -75,6 +75,8 @@ import org.springblade.system.entity.DictBiz;
 import org.springblade.system.feign.IDictBizClient;
 import org.springblade.system.user.entity.User;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.BeanPropertyRowMapper;
+import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -137,6 +139,8 @@ public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper,
 	private final IArchiveExpertConclusionService expertConclusionService;
 	private final ITraceLogService iTraceLogService;
 
+    private final JdbcTemplate jdbcTemplate;
+
 	//表格高度
 	private static int high = 20;
 	//表格宽度
@@ -4038,7 +4042,9 @@ public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper,
         String[] ids = archiveIds.split(",");
         for (String archiveId : ids) {
             ArchivesAuto auto = baseMapper.selectById(archiveId);
-            List<ArchiveFile> archiveFiles = archiveFileClient.getArchiveFileByArchiveID(Long.valueOf(archiveId));
+            String sql="select * from u_archive_file where archive_id = "+archiveId+" and is_deleted = 0 order by sort,sort_num,create_time";
+            //List<ArchiveFile> archiveFiles = archiveFileClient.getArchiveFileByArchiveID(Long.valueOf(archiveId));
+            List<ArchiveFile> archiveFiles= jdbcTemplate.query(sql, new BeanPropertyRowMapper<>(ArchiveFile.class));
             archiveAutoPdfService.buildArchiveFrontPdfs(projectId,auto,archiveFiles,true);
             baseMapper.updateById(auto);
         }

blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java

@@ -228,30 +228,19 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, User> implement
                         String sql = "select * from m_contract_relation_jlyz where contract_id_jlyz = " + contractInfo.getId();
                         List<String> record_SG = jdbcTemplate.query(sql, new BeanPropertyRowMapper<>(ContractRelationJlyz.class)).stream().map(ContractRelationJlyz::getContractIdSg).collect(Collectors.toList()).stream().map(String::valueOf).collect(Collectors.toList());
                         if (record_SG.size() > 0) {
-                            for (String sgId : record_SG) {
+                           a: for (String sgId : record_SG) {
                                 //当前施工合同段所有用户角色信息
                                 String sql2 = "select * from m_project_assignment_user where contract_id = " + sgId + " and post_id is null and status = 1 and is_deleted = 0";
                                 List<SaveUserInfoByProjectDTO> userRoleInfoSG = jdbcTemplate.query(sql2, new BeanPropertyRowMapper<>(SaveUserInfoByProjectDTO.class));
-
-                                //去重
-                                List<SaveUserInfoByProjectDTO> lists = BeanUtil.copyProperties(user.getProjectAndUserList(), SaveUserInfoByProjectDTO.class);
-                                if (lists.size() > 0) {
-                                    Iterator<SaveUserInfoByProjectDTO> iterator = lists.iterator();
-                                    while (iterator.hasNext()) {
-                                        SaveUserInfoByProjectDTO jl = iterator.next();
-                                        for (SaveUserInfoByProjectDTO sg : userRoleInfoSG) {
-                                            if (sg.getUserId().equals(jl.getUserId())) {
-                                                //如果监理合同段与施工合同段中有相同的用户信息，就移除，一个用户只能存在一个合同段中
-                                                iterator.remove();
-                                            }
-                                        }
+                                for (SaveUserInfoByProjectDTO sg : userRoleInfoSG) {
+                                    if (sg.getUserId().equals(i.getUserId())) {
+                                        //如果监理合同段与施工合同段中有相同的用户信息，就移除，一个用户只能存在一个合同段中
+                                        continue a;
                                     }
                                 }
-
                                 //重构入参
                                 List<SaveUserInfoByProjectDTO> addList = new ArrayList<>();
-                                for (SaveUserInfoByProjectDTO jl : lists) {
-                                    SaveUserInfoByProjectDTO newObj = BeanUtil.copyProperties(jl, SaveUserInfoByProjectDTO.class);
+                                    SaveUserInfoByProjectDTO newObj = BeanUtil.copyProperties(i, SaveUserInfoByProjectDTO.class);
                                     assert newObj != null;
                                     newObj.setId(SnowFlakeUtil.getId());
                                     newObj.setContractId(sgId);
@@ -263,8 +252,6 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, User> implement
                                     newObj.setCreateTime(new Date());
                                     newObj.setIsRecordJlId(contractInfo.getId()); //从监理合同段关联的数据，用于删除关联时同步删除用户信息
                                     addList.add(newObj);
-                                }
-
                                 //保存监理数据时，同步到对应关联的施工合同段中去
                                 if (addList.size() > 0) {
                                     contractClient.saveUserInfoByProjectThree(addList);