修改bug

commons/src/main/java/com/jzg/commons/entity/dto/AgreementParam.java

@@ -60,5 +60,8 @@ public class AgreementParam extends PageRequest {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime loseEndDate;
 
+    @Schema(description = "租户code")
+    private String systemCode;
+
 
 }

commons/src/main/java/com/jzg/commons/service/impl/OperatorTrajectoryServiceImpl.java

@@ -58,6 +58,7 @@ public class OperatorTrajectoryServiceImpl implements OperatorTrajectoryService
         LambdaQueryWrapper<OperatorTrajectory> lambdaQueryWrapper = new LambdaQueryWrapper<>();
         lambdaQueryWrapper.like(StringUtils.isNotEmpty(logParam.getOperator()),OperatorTrajectory::getCreateBy,logParam.getOperator());
         lambdaQueryWrapper.like(StringUtils.isNotEmpty(logParam.getFunction()),OperatorTrajectory::getModuleName,logParam.getFunction());
+        lambdaQueryWrapper.like(StringUtils.isNotEmpty(logParam.getContent()),OperatorTrajectory::getOperationContent,logParam.getContent());
         if (CollectionUtils.isNotEmpty(logParam.getOperatingTime())) {
             List<LocalDate> dates = logParam.getOperatingTime();
             if (dates.size() >= 2) {

commons/src/main/java/com/jzg/commons/util/comparble/DescriptionUtils.java

@@ -58,9 +58,9 @@ public class DescriptionUtils {
                         description.append(",");
                     }
                     if (fieldDescription.contains("-")){
-                        description.append(fieldDescription.substring(0, fieldDescription.indexOf("-"))).append(" %").append(fieldValue).append("%").append(fieldDescription.substring(fieldDescription.substring(0, fieldDescription.indexOf("-")).length()+1, fieldDescription.length())) ;
+                        description.append(fieldDescription.substring(0, fieldDescription.indexOf("-"))).append(fieldValue).append(fieldDescription.substring(fieldDescription.substring(0, fieldDescription.indexOf("-")).length()+1, fieldDescription.length())) ;
                     }else {
-                        description.append(fieldDescription).append(" %").append(fieldValue).append("%");
+                        description.append(fieldDescription).append(fieldValue);
                     }
                     appendComma = true;
                 }

platform/src/main/java/com/jzg/service/impl/UserRoleServiceImpl.java

@@ -113,7 +113,25 @@ public class UserRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> imp
             perms.setPerms(item.getAuth());
             sysRolePermsList.add(perms);
         });
-
+        SysRoleDataScope sysRoleDataScope = new SysRoleDataScope();
+        sysRoleDataScope.setRoleId(sysRole.getId());
+        sysRoleDataScope.setDataMark(sysRoleVo.getDataScope().getDataMark());
+        sysRoleDataScopeMapper.insert(sysRoleDataScope);
+        if (sysRoleVo.getDataScope().getDataMark().equals("2") || sysRoleVo.getDataScope().getDataMark().equals("1")) {
+            List<SysRoleDataScopeLink> sysRoleDataScopeLinks = new ArrayList<>();
+            if (!Objects.isNull(sysRoleVo.getDataScope().getDeptIds())) {
+                if (!sysRoleVo.getDataScope().getDeptIds().isEmpty()) {
+                    sysRoleVo.getDataScope().getDeptIds().forEach(item -> {
+                        SysRoleDataScopeLink sysRoleDataScopeLink = new SysRoleDataScopeLink();
+                        sysRoleDataScopeLink.setId(IdGenerate.nextId());
+                        sysRoleDataScopeLink.setRoleId(sysRole.getId());
+                        sysRoleDataScopeLink.setDeptId(item);
+                        sysRoleDataScopeLinks.add(sysRoleDataScopeLink);
+                    });
+                }
+            }
+            sysRoleDataScopeLinkMapper.insert(sysRoleDataScopeLinks);
+        }
         if(sysRolePermsMapper.insert(sysRolePermsList).stream().count() > 0 && baseMapper.insert(sysRole) > 0){
             return true;
         }

tenant/organization/src/main/java/com/jzg/organization/service/impl/PtlAgreementServiceImpl.java

@@ -16,6 +16,7 @@ import com.jzg.commons.util.MinioUtils;
 import com.jzg.commons.util.StringUtils;
 import com.jzg.organization.client.EsmInsCompanyClient;
 import com.jzg.organization.mapper.PtlAgreementMapper;
+import com.jzg.organization.mapper.SysUploadFilesMapper;
 import com.jzg.organization.mapper.SysUserMapper;
 import com.jzg.organization.service.*;
 import org.apache.commons.lang3.ObjectUtils;
@@ -71,9 +72,15 @@ public class PtlAgreementServiceImpl extends ServiceImpl<PtlAgreementMapper, Ptl
     @Autowired
     private PtlAgreementUndwrtRulesAttrLinkService agreementUndwrtRulesAttrLinkService;
 
+    @Autowired
+    private SysDeptService sysDeptService;
+
+    @Autowired
+    private SysUploadFilesMapper sysUploadFilesMapper;
 
     @Override
     public Page<AgreementVo> queryPage(AgreementParam param) {
+        param.setSystemCode(baseController.getUserSystemCode());
         Page<AgreementVo> page = baseMapper.queryPage(param.getPage(), param);
         List<AgreementVo> agreementVos = page.getRecords();
         if(CollUtil.isNotEmpty(agreementVos)){
@@ -138,6 +145,12 @@ public class PtlAgreementServiceImpl extends ServiceImpl<PtlAgreementMapper, Ptl
         // 获取协议授权
         List<PtlAgreementDept> deptList = agreementDeptService.getByAgreementId(id);
         AgreementInfoVo agreementInfoVo = new AgreementInfoVo(agreementVo,deptList);
+        // 获取协议文件
+        if (agreementVo.getFileId() != null) {
+            SysUploadFiles sysUploadFiles = sysUploadFilesMapper.selectById(agreementVo.getFileId());
+            agreementInfoVo.getAgreement().setFileName(sysUploadFiles.getFileName());
+            agreementInfoVo.getAgreement().setFileUrl(MinioUtils.getPresignedObjectUrl(sysUploadFiles.getBucketName(), sysUploadFiles.getFileName()));
+        }
         return agreementInfoVo;
     }
 
@@ -181,6 +194,7 @@ public class PtlAgreementServiceImpl extends ServiceImpl<PtlAgreementMapper, Ptl
         ptlAgreement.setSerialNumber(0);
         ptlAgreement.setIsExternal(0);
         ptlAgreement.setIsEnable(YesNoEnum.NO.getCode()); // 启用
+        ptlAgreement.setSystemCode(sysCode);
 
         // 判断生效状态
         LocalDateTime startDate = param.getStartDate();
@@ -193,7 +207,30 @@ public class PtlAgreementServiceImpl extends ServiceImpl<PtlAgreementMapper, Ptl
             ptlAgreement.setValidStatus("1");
         }
         save(ptlAgreement);
+        // 默认添加协议后 协议授权到当前账号的机构以及子机构下
+        String deptId = baseController.getUserDeptId();
+        SysDeptParam deptParam = new SysDeptParam();
+        deptParam.setSysCode(sysCode);
+        List<SysDeptVo> deptTree = sysDeptService.getDeptTree(deptId,deptParam);
+        List<PtlAgreementDept> agreementDeptList = new ArrayList<>();
+        processDeptTree(deptTree, ptlAgreement.getId(), agreementDeptList);
+        agreementDeptService.saveBatch(agreementDeptList);
     }
+    // 递归方法：处理部门及其子部门
+    private void processDeptTree(List<SysDeptVo> deptList, String agreementId, List<PtlAgreementDept> resultList) {
+        for (SysDeptVo dept : deptList) {
+            // 处理当前部门
+            PtlAgreementDept agreementDept = new PtlAgreementDept();
+            agreementDept.setAgreementId(agreementId);
+            agreementDept.setDeptId(dept.getId());
+            resultList.add(agreementDept);
+            // 递归处理子部门
+            if (dept.getChildren() != null && !dept.getChildren().isEmpty()) {
+                processDeptTree(dept.getChildren(), agreementId, resultList);
+            }
+        }
+    }
+
 
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -289,6 +326,7 @@ public class PtlAgreementServiceImpl extends ServiceImpl<PtlAgreementMapper, Ptl
         PtlAgreement newAgreement = new PtlAgreement();
         BeanUtils.copyProperties(agreement,newAgreement);
         newAgreement.setId(null);
+        newAgreement.setAgreementTitle(agreement.getAgreementTitle() + System.currentTimeMillis());
         newAgreement.setAgreementCode(sysCode + companyCode + +System.currentTimeMillis());
         newAgreement.setAuditStatus(0);
         newAgreement.setIsEnable(0);

tenant/organization/src/main/resources/mapper/PtlAgreementMapper.xml

@@ -74,6 +74,9 @@
             <if test="param.searchValue != null and param.searchValue != ''">
                 and ( pa.agreement_code = #{param.searchValue} or pa.agreement_title = #{param.searchValue} or pa.agreement_abbreviation = #{param.searchValue})
             </if>
+            <if test="param.systemCode != null and param.systemCode != ''">
+                and pa.system_code = #{param.systemCode}
+            </if>
             <if test="param.companyId != null and param.companyId != ''">
                 and pa.company_id = #{param.companyId}
             </if>