权限修改

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());

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();

jwtech-system/src/main/java/com/kms/build/mapper/BsSgcjsjdBuiProInfoMapper.java

@@ -54,7 +54,8 @@ public interface BsSgcjsjdBuiProInfoMapper extends BaseMapper<BsSgcjsjdBuiProInf
                                                 @Param("orderBy") String orderBy,
                                                 Page page);
 
-    IPage<AssertStatisticsDto> selectPageByCode(@Param("id") String id,
+    IPage<AssertStatisticsDto> selectPageByCode(@Param("userId") String userId,
+                                                @Param("id") String id,
                                                 @Param("projectName") String projectName,
                                                 @Param("isMajor") String isMajor,
                                                 @Param("projectType") String projectType,

jwtech-system/src/main/java/com/kms/build/service/BsSgcjsjdBuiProInfoService.java

@@ -240,11 +240,10 @@ public class BsSgcjsjdBuiProInfoService extends BaseService<BsSgcjsjdBuiProInfoM
         SysDept sysDept = sysDeptService.get(deptId);
         String xzqhId = sysDept.getXzqhId();
 
-        list = bsSgcjsjdBuiProInfoMapper.selectPageByCode(data.getId(), data.getProjectName(), isMajor, data.getProjectType(),
+        list = bsSgcjsjdBuiProInfoMapper.selectPageByCode(sysUser.getId(),data.getId(), data.getProjectName(), isMajor, data.getProjectType(),
                 sysXzqhService.getSubString(xzqhId),
                 "create_time", new Page<>(sp.getPageNum(), sp.getPageSize()));
 
-
         return list;
     }
 

jwtech-system/src/main/java/com/kms/earlyStage/mapper/SpecialProjectPreDesignMapper.java

@@ -34,7 +34,8 @@ public interface SpecialProjectPreDesignMapper extends BaseMapper<SpecialProject
                                                 @Param("orderBy") String orderBy,
                                                 Page page);
 
-    IPage<SpecialProjectPreDesign> listProject(@Param("adcd") String subString,
+    IPage<SpecialProjectPreDesign> listProject(@Param("userId") String userId,
+                                               @Param("adcd") String subString,
                                                @Param("projectName") String projectName,
                                                @Param("bindStatus") String bindStatus,
                                                Page page);

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<SpecialProjectInfoMap
     @Autowired
     private SysDeptService sysDeptService;
 
+    @Autowired
+    private SysUserProService sysUserProService;
+
 
     /*public IPage selectPage(SearchParam<SpecialProjectInfo> sp,String adcd){
         SpecialProjectInfo data = sp.getData();
@@ -71,8 +76,9 @@ public class SpecialProjectInfoService extends BaseService<SpecialProjectInfoMap
 
         SpecialProjectInfo data = sp.getData();
 
+        String roles = sysUser.getRoleIds().toString();
 
-        if (sysUser.getUserType().equals("00") && data.getAdcd() == null) {
+        if (sysUser.getUserType().equals("00")) {
             String deptId = sysUser.getDeptId();
             SysDept sysDept = sysDeptService.get(deptId);
             String xzqhId = sysDept.getXzqhId();
@@ -80,7 +86,6 @@ public class SpecialProjectInfoService extends BaseService<SpecialProjectInfoMap
         }
 
         Map<String, Object> params = sp.getParams();
-
         assert sysUser != null;
 
         IPage<SpecialProjectInfo> list1 = null;

jwtech-system/src/main/java/com/kms/earlyStage/service/SpecialProjectPreDesignService.java

@@ -81,8 +81,8 @@ public class SpecialProjectPreDesignService extends BaseService<SpecialProjectPr
     public IPage<SpecialProjectPreDesign> listProject(SearchParam<SpecialProjectPreDesign> sp) {
         SpecialProjectPreDesign data = sp.getData();
 
-
-        IPage<SpecialProjectPreDesign> page=specialProjectPreDesignMapper.listProject(sysXzqhService.getSubString(data.getAdcd()), data.getProjectName(),
+        SysUser user = UserUtils.getUser();
+        IPage<SpecialProjectPreDesign> page=specialProjectPreDesignMapper.listProject(user.getId(),sysXzqhService.getSubString(data.getAdcd()), data.getProjectName(),
                 data.getBindStatus(),
                 new Page<>(sp.getPageNum(), sp.getPageSize()));
 

jwtech-system/src/main/resources/mapper/build/BsSgcjsjdBuiProInfoMapper.xml

@@ -222,6 +222,18 @@
             <if test="projectType!=null and projectType!=''">
                 and pp.project_type=#{projectType}
             </if>
+            <if test="userId!=null and userId!=''">
+                and pp.PRO_NO IN (
+                SELECT
+                PRO_NO
+                FROM
+                sys_user_pro
+                <where>
+                    <if test="userId!=null and userId!=''">
+                        AND user_id=#{userId})
+                    </if>
+                </where>
+            </if>
             <include refid="com.kms.system.mapper.SysXzqhMapper.xzqhCondition"></include>
         </where>
         GROUP BY pi.PRO_CODE

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
         <where>
-
+            1 = 1
             <if test="adcd!=null and adcd !=''">
                 and pi.adcd like concat(#{adcd},'%')
             </if>
@@ -115,6 +115,16 @@
             <if test="bindStatus!=null and bindStatus!=''">
                 and bind_status=#{bindStatus}
             </if>
+            <if test="userId!=null and userId!=''">
+                and (pi.PRO_NO IN (
+                SELECT
+                PRO_NO
+                FROM
+                sys_user_pro
+                where
+                user_id = #{userId}) or
+                bind_status = 0)
+            </if>
         </where>
         group by pi.pro_no
     </select>

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
             <where>
+                1 = 1
                 <if test="userId!=null and userId!=''">
                     AND su.id=#{userId})
                 </if>
@@ -84,6 +85,7 @@
         </if>
         <if test="userType==00">
             <where>
+            1=1
                 <if test="enterpriseName!=null and enterpriseName!=''">
                     and enterprise_name like concat('%',#{enterpriseName},'%')
                 </if>