脚本调整结束，按照时长分配，（第一个脚本）

src/main/java/com/subsidy/service/impl/AdministerServiceImpl.java

@@ -333,7 +333,7 @@ public class AdministerServiceImpl extends ServiceImpl<AdministerMapper, Adminis
     public IPage<OperatorsVO> operators(OperatorsDTO operatorsDTO) {
     public IPage<OperatorsVO> operators(OperatorsDTO operatorsDTO) {
         Page pager = new Page(operatorsDTO.getPageNum(), operatorsDTO.getPageSize());
         Page pager = new Page(operatorsDTO.getPageNum(), operatorsDTO.getPageSize());
 
 
-        IPage<OperatorsVO> operatorsVOIPage = companyDictMapper.operators(pager, operatorsDTO.getCompanyName(), operatorsDTO.getFieldId(), null, 0);
+        IPage<OperatorsVO> operatorsVOIPage = companyDictMapper.operators(pager, operatorsDTO.getCompanyName(), operatorsDTO.getFieldId(), null, 1);
 
 
         List<OperatorsVO> operatorsVOS = operatorsVOIPage.getRecords();
         List<OperatorsVO> operatorsVOS = operatorsVOIPage.getRecords();
         for (OperatorsVO operatorsVO : operatorsVOS) {
         for (OperatorsVO operatorsVO : operatorsVOS) {

src/main/java/com/subsidy/service/impl/CompanyDictServiceImpl.java

@@ -102,7 +102,7 @@ public class CompanyDictServiceImpl extends ServiceImpl<CompanyDictMapper, Compa
         if (count > 0){
         if (count > 0){
             administerDO.setCompanyId(null);
             administerDO.setCompanyId(null);
         }
         }
-        IPage page = this.baseMapper.operators(pager, operatorsDTO.getCompanyName(), operatorsDTO.getFieldId(),administerDO.getCompanyId(),null);
+        IPage page = this.baseMapper.operators(pager, operatorsDTO.getCompanyName(), operatorsDTO.getFieldId(),administerDO.getCompanyId(),2);
         List<OperatorsVO> operatorsVOS = page.getRecords();
         List<OperatorsVO> operatorsVOS = page.getRecords();
         for (OperatorsVO operatorsVO : operatorsVOS) {
         for (OperatorsVO operatorsVO : operatorsVOS) {
             //查看公司所在行业
             //查看公司所在行业

src/main/java/com/subsidy/util/EncryptUtil.java

-package com.subsidy.util;
-
-import com.amdelamar.jhash.Hash;
-import com.amdelamar.jhash.algorithms.Type;
-import com.amdelamar.jhash.exception.InvalidHashException;
-
-public class EncryptUtil {
-
-    /**
-     * 设置密文密码
-     *
-     * @param password 原始密码
-     * @return 加密密码
-     */
-    public static String encrypt(String password) {
-        char[] chars = password.toCharArray();
-        return Hash.password(chars).algorithm(Type.PBKDF2_SHA256).create();
-    }
-
-    /**
-     * 验证加密密码
-     *
-     * @param encryptedPassword 密文密码
-     * @param plainPassword     明文密码
-     * @return 验证是否成功
-     */
-    public static boolean verify(String encryptedPassword, String plainPassword) {
-        char[] chars = plainPassword.toCharArray();
-        try {
-            return Hash.password(chars).algorithm(Type.PBKDF2_SHA256).verify(encryptedPassword);
-        } catch (InvalidHashException e) {
-            return false;
-        }
-    }
-}
+//package com.subsidy.util;
+//
+//import com.amdelamar.jhash.Hash;
+//import com.amdelamar.jhash.algorithms.Type;
+//import com.amdelamar.jhash.exception.InvalidHashException;
+//
+//public class EncryptUtil {
+//
+//    /**
+//     * 设置密文密码
+//     *
+//     * @param password 原始密码
+//     * @return 加密密码
+//     */
+//    public static String encrypt(String password) {
+//        char[] chars = password.toCharArray();
+//        return Hash.password(chars).algorithm(Type.PBKDF2_SHA256).create();
+//    }
+//
+//    /**
+//     * 验证加密密码
+//     *
+//     * @param encryptedPassword 密文密码
+//     * @param plainPassword     明文密码
+//     * @return 验证是否成功
+//     */
+//    public static boolean verify(String encryptedPassword, String plainPassword) {
+//        char[] chars = plainPassword.toCharArray();
+//        try {
+//            return Hash.password(chars).algorithm(Type.PBKDF2_SHA256).verify(encryptedPassword);
+//        } catch (InvalidHashException e) {
+//            return false;
+//        }
+//    }
+//}

src/main/resources/application.properties

 # 环境配置
 # 环境配置
-spring.profiles.active=prod
+spring.profiles.active=dev
 # 端口号
 # 端口号
-spring.server.port=23459
+spring.server.port=23457
 #嵌入tomcat配置
 #嵌入tomcat配置
 #和CPU数
 #和CPU数
 spring.server.acceptorThreadCount=600
 spring.server.acceptorThreadCount=600

src/main/resources/mapper/CompanyDictMapper.xml

@@ -34,14 +34,18 @@
             t2.address
             t2.address
         FROM
         FROM
             administer t
             administer t
+            left join role_administer_mapping t4 on t.id = t4.administer_id
             left join company_dict t2 on t.company_id = t2.id
             left join company_dict t2 on t.company_id = t2.id
             left join company_field_mapping t3 on t2.id = t3.company_id
             left join company_field_mapping t3 on t2.id = t3.company_id
         WHERE
         WHERE
             t.delete_date IS NULL
             t.delete_date IS NULL
             and t2.delete_date is null
             and t2.delete_date is null
             and t3.delete_date is null
             and t3.delete_date is null
-            <if test="role != null">
-                and t.role = #{role}
+            <if test="role == 1">
+                (and t4.role = 1 or t4.role_id = 3)
+            </if>
+            <if test="role == 2">
+                (and t4.role = 2)
             </if>
             </if>
             <if test="id != null and id != ''">
             <if test="id != null and id != ''">
                 and t2.id = #{id}
                 and t2.id = #{id}