diff --git a/jwtech-admin/src/main/java/com/kms/config/scheduled/WaterScheduled.java b/jwtech-admin/src/main/java/com/kms/config/scheduled/WaterScheduled.java index 53e41409..cf567efc 100644 --- a/jwtech-admin/src/main/java/com/kms/config/scheduled/WaterScheduled.java +++ b/jwtech-admin/src/main/java/com/kms/config/scheduled/WaterScheduled.java @@ -147,6 +147,7 @@ public class WaterScheduled { dept.setXzqhId(singleOrg.getArea()); dept.setXzqhName(singleOrg.getAreaText()); dept.setSingleCode(singleOrg.getCode()); + dept.setUnifiedSocialCreditCode(singleOrg.getCode()); dept.setSingleSeq(singleOrg.getSeq()); dept.setSingleType(singleOrg.getType()); dept.setDeptName(singleOrg.getName()); diff --git a/jwtech-admin/src/main/java/com/kms/web/controller/common/CommonController.java b/jwtech-admin/src/main/java/com/kms/web/controller/common/CommonController.java index d998e0d8..03a4f8e1 100644 --- a/jwtech-admin/src/main/java/com/kms/web/controller/common/CommonController.java +++ b/jwtech-admin/src/main/java/com/kms/web/controller/common/CommonController.java @@ -61,10 +61,7 @@ public class CommonController { try { - String uploadType = JianweiConfig.getUploadType(); - - if (uploadType.equals("disk")) { // 本地资源路径 String localPath = JianweiConfig.getProfile(); diff --git a/jwtech-system/src/main/java/com/kms/build/mapper/BsSgcjsjdBuiProInfoMapper.java b/jwtech-system/src/main/java/com/kms/build/mapper/BsSgcjsjdBuiProInfoMapper.java index 30ee8cb6..704d9055 100644 --- a/jwtech-system/src/main/java/com/kms/build/mapper/BsSgcjsjdBuiProInfoMapper.java +++ b/jwtech-system/src/main/java/com/kms/build/mapper/BsSgcjsjdBuiProInfoMapper.java @@ -54,7 +54,8 @@ public interface BsSgcjsjdBuiProInfoMapper extends BaseMapper selectPageByCode(@Param("id") String id, + IPage selectPageByCode(@Param("userId") String userId, + @Param("id") String id, @Param("projectName") String projectName, @Param("isMajor") String isMajor, @Param("projectType") String projectType, diff --git a/jwtech-system/src/main/java/com/kms/build/service/BsSgcjsjdBuiProInfoService.java b/jwtech-system/src/main/java/com/kms/build/service/BsSgcjsjdBuiProInfoService.java index d39f9ce1..2a552546 100644 --- a/jwtech-system/src/main/java/com/kms/build/service/BsSgcjsjdBuiProInfoService.java +++ b/jwtech-system/src/main/java/com/kms/build/service/BsSgcjsjdBuiProInfoService.java @@ -240,11 +240,10 @@ public class BsSgcjsjdBuiProInfoService extends BaseService(sp.getPageNum(), sp.getPageSize())); - return list; } diff --git a/jwtech-system/src/main/java/com/kms/earlyStage/mapper/SpecialProjectPreDesignMapper.java b/jwtech-system/src/main/java/com/kms/earlyStage/mapper/SpecialProjectPreDesignMapper.java index dbc14133..956a094c 100644 --- a/jwtech-system/src/main/java/com/kms/earlyStage/mapper/SpecialProjectPreDesignMapper.java +++ b/jwtech-system/src/main/java/com/kms/earlyStage/mapper/SpecialProjectPreDesignMapper.java @@ -34,7 +34,8 @@ public interface SpecialProjectPreDesignMapper extends BaseMapper listProject(@Param("adcd") String subString, + IPage listProject(@Param("userId") String userId, + @Param("adcd") String subString, @Param("projectName") String projectName, @Param("bindStatus") String bindStatus, Page page); diff --git a/jwtech-system/src/main/java/com/kms/earlyStage/service/SpecialProjectInfoService.java b/jwtech-system/src/main/java/com/kms/earlyStage/service/SpecialProjectInfoService.java index 5ebe60af..fe3ad8be 100644 --- a/jwtech-system/src/main/java/com/kms/earlyStage/service/SpecialProjectInfoService.java +++ b/jwtech-system/src/main/java/com/kms/earlyStage/service/SpecialProjectInfoService.java @@ -13,7 +13,9 @@ import com.jianwei.common.core.domain.entity.SysUser; import com.kms.common.utils.UserUtils; import com.kms.earlyStage.domain.SpecialProjectInfo; import com.kms.earlyStage.mapper.SpecialProjectInfoMapper; +import com.kms.system.domain.SysUserPro; import com.kms.system.service.SysDeptService; +import com.kms.system.service.SysUserProService; import com.kms.system.service.SysXzqhService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -41,6 +43,9 @@ public class SpecialProjectInfoService extends BaseService sp,String adcd){ SpecialProjectInfo data = sp.getData(); @@ -71,8 +76,9 @@ public class SpecialProjectInfoService extends BaseService params = sp.getParams(); - assert sysUser != null; IPage list1 = null; diff --git a/jwtech-system/src/main/java/com/kms/earlyStage/service/SpecialProjectPreDesignService.java b/jwtech-system/src/main/java/com/kms/earlyStage/service/SpecialProjectPreDesignService.java index a467704d..41f80676 100644 --- a/jwtech-system/src/main/java/com/kms/earlyStage/service/SpecialProjectPreDesignService.java +++ b/jwtech-system/src/main/java/com/kms/earlyStage/service/SpecialProjectPreDesignService.java @@ -81,8 +81,8 @@ public class SpecialProjectPreDesignService extends BaseService listProject(SearchParam sp) { SpecialProjectPreDesign data = sp.getData(); - - IPage page=specialProjectPreDesignMapper.listProject(sysXzqhService.getSubString(data.getAdcd()), data.getProjectName(), + SysUser user = UserUtils.getUser(); + IPage page=specialProjectPreDesignMapper.listProject(user.getId(),sysXzqhService.getSubString(data.getAdcd()), data.getProjectName(), data.getBindStatus(), new Page<>(sp.getPageNum(), sp.getPageSize())); diff --git a/jwtech-system/src/main/resources/mapper/build/BsSgcjsjdBuiProInfoMapper.xml b/jwtech-system/src/main/resources/mapper/build/BsSgcjsjdBuiProInfoMapper.xml index ab369233..ba0daee8 100644 --- a/jwtech-system/src/main/resources/mapper/build/BsSgcjsjdBuiProInfoMapper.xml +++ b/jwtech-system/src/main/resources/mapper/build/BsSgcjsjdBuiProInfoMapper.xml @@ -222,6 +222,18 @@ and pp.project_type=#{projectType} + + and pp.PRO_NO IN ( + SELECT + PRO_NO + FROM + sys_user_pro + + + AND user_id=#{userId}) + + + GROUP BY pi.PRO_CODE diff --git a/jwtech-system/src/main/resources/mapper/earlyStage/SpecialProjectPreDesignMapper.xml b/jwtech-system/src/main/resources/mapper/earlyStage/SpecialProjectPreDesignMapper.xml index 059fd79a..6c21ffa6 100644 --- a/jwtech-system/src/main/resources/mapper/earlyStage/SpecialProjectPreDesignMapper.xml +++ b/jwtech-system/src/main/resources/mapper/earlyStage/SpecialProjectPreDesignMapper.xml @@ -105,7 +105,7 @@ LEFT JOIN bs_slgc_qqjd_spe_pro_proposal pp ON pi.pro_code = pp.project_code AND pi.pro_no = pp.pro_no - + 1 = 1 and pi.adcd like concat(#{adcd},'%') @@ -115,6 +115,16 @@ and bind_status=#{bindStatus} + + and (pi.PRO_NO IN ( + SELECT + PRO_NO + FROM + sys_user_pro + where + user_id = #{userId}) or + bind_status = 0) + group by pi.pro_no diff --git a/jwtech-system/src/main/resources/mapper/enterprise/BsSgcYxjdEnterpriseInfoMapper.xml b/jwtech-system/src/main/resources/mapper/enterprise/BsSgcYxjdEnterpriseInfoMapper.xml index 9e92e881..13c0a276 100644 --- a/jwtech-system/src/main/resources/mapper/enterprise/BsSgcYxjdEnterpriseInfoMapper.xml +++ b/jwtech-system/src/main/resources/mapper/enterprise/BsSgcYxjdEnterpriseInfoMapper.xml @@ -72,6 +72,7 @@ FROM sys_user su left join sys_dept sd on su.dept_id=sd.id + 1 = 1 AND su.id=#{userId}) @@ -84,6 +85,7 @@ + 1=1 and enterprise_name like concat('%',#{enterpriseName},'%')