Merge remote-tracking branch 'origin/master'

jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/warnMsg/index.vue

@@ -210,7 +210,6 @@
           <el-button
             type="primary"
             @click="dealWarn"
-            v-if="activeNode == 1"
             :disabled="
               !warnForm.status || warnForm.status == '2' ? false : true
             "
@@ -218,9 +217,9 @@
           >
           <el-button
             type="primary"
-            v-if="activeNode == 2"
             @click="examineWarn"
             :disabled="warnForm.status == '0' ? false : true"
+            v-hasPermi="['warn:warn:shenhe']"
             >预警审核</el-button
           >
         </div>

jwtech-admin/src/main/java/com/kms/config/WaterRequestUtil.java

@@ -236,11 +236,10 @@ public class WaterRequestUtil {
         log.info("--------请求获取门户角色信息,请求地址为:"+resourceUrl);
         HashMap<String, Object> hashMap = new HashMap<>();
         hashMap.put("systemCode",systemCode);
-//        hashMap.put("systemId",systemAppsecret);
+        HttpRequest get = createPost(resourceUrl+"?systemCode="+systemCode,resourceServiceId,resourceAppsecret);
-//        HttpRequest get = createPost(resourceUrl+"?systemCode="+systemCode,resourceServiceId,resourceAppsecret);
+//        HttpRequest get = createPost(resourceUrl,resourceServiceId,resourceAppsecret);
-        HttpRequest get = createPost(resourceUrl,resourceServiceId,resourceAppsecret);
         get.header("Authorization",authorization);
-        HttpResponse response = get.body(JSONObject.toJSONString(hashMap))
+        HttpResponse response = get
                 .execute();
         String body = response.body();
         WaterResult waterResult = JSONObject.parseObject(body, WaterResult.class);
@@ -284,9 +283,6 @@ public class WaterRequestUtil {
 
 
 
-
-
-
     private void isSuccess(WaterResult waterResult){
         if(waterResult==null){
             throw new CustomException("请求异常");

jwtech-admin/src/main/java/com/kms/web/controller/system/SysLoginController.java

@@ -168,6 +168,7 @@ public class SysLoginController extends BaseController {
 		// 用户信息
 		SysUser user = UserUtils.getUser();
 		List<SysMenu> menus = menuService.selectMenuTreeByUserId(user.getId());
+//		List<SysMenu> menus = menuService.selectMenuTreeByUserId("1");
 		return AjaxResult.success(menuService.buildMenus(menus));
 	}
 
@@ -241,7 +242,7 @@ public class SysLoginController extends BaseController {
 
 	/**
 	 * 根据用户token获取资源权限
-	 * @param token
+	 * @param
 	 * @return
 	 */
 //	@GetMapping("/getSingleRotes/{token}")
@@ -278,18 +279,23 @@ public class SysLoginController extends BaseController {
 		@Transactional
 		public void run() {
 			try {
+			System.out.println("---------------------------------------------------");
 			WaterResult result = waterRequestUtil.getUserResource(token);
 			List<SingleMenu> singleMenus = JSONObject.parseArray(result.getData(), SingleMenu.class);
 			List<SingleMenu> singleAllMenus = new ArrayList<>();
 			setChildren(singleMenus,singleAllMenus);
+			String data = waterResult.getData();
+			JSONObject datajson = JSONObject.parseObject(data);
+			List<String> functionPerms = datajson.getJSONArray("functionPerms").toJavaList(String.class);
 			List<String> collect = singleAllMenus.stream().map(singleMenu -> singleMenu.getPermissionCode()).collect(Collectors.toList());
+			collect.addAll(functionPerms);
 			QueryWrapper<SysMenu> menuQueryWrapper = Wrappers.query();
 			menuQueryWrapper.in("perms",collect);
 			List<SysMenu> menus = sysMenuService.list(menuQueryWrapper);
+				List<String> menuids = menus.stream().map(menu -> {
+					return menu.getId();
+				}).collect(Collectors.toList());
 //			WaterResult waterResult = waterRequestUtil.authUser(token);
-			String data = waterResult.getData();
-			JSONObject datajson = JSONObject.parseObject(data);
-//			List<String> functionPerms = datajson.getJSONArray("functionPerms").toJavaList(String.class);
 			List<String> roles = datajson.getJSONArray("roles").toJavaList(String.class);
 			log.info("获取的权限有："+roles);
 			if(CollectionUtil.isNotEmpty(roles)) {
@@ -297,18 +303,27 @@ public class SysLoginController extends BaseController {
 				sysRoleQueryWrapper.in("role_key", roles);
 				List<SysRole> roleList = sysRoleService.list(sysRoleQueryWrapper);
 				if (CollectionUtil.isNotEmpty(roleList)) {
-					QueryWrapper<SysRoleMenu> sysRoleMenuQueryWrapper = Wrappers.query();
 					List<String> rids = roleList.stream().map(role -> role.getId()).collect(Collectors.toList());
+					for (SysRole sysRole : roleList) {
+						QueryWrapper<SysRoleMenu> sysRoleMenuQueryWrapper = Wrappers.query();
 						if (CollectionUtil.isNotEmpty(rids)) {
-						sysRoleMenuQueryWrapper.in("role_id", rids);
+							sysRoleMenuQueryWrapper.eq("role_id", sysRole.getId());
+							List<SysRoleMenu> list = sysRoleMenuService.list(sysRoleMenuQueryWrapper);
+							List<String> menutwoids = list.stream().map(menu -> {
+								return menu.getMenuId();
+							}).collect(Collectors.toList());
+							List<String> disjunction = (List<String>) CollectionUtil.disjunction(menuids, menutwoids);
+							menuids.removeAll(menutwoids);
+							if(CollectionUtil.isNotEmpty(disjunction)) { //存在不存在的按钮 进行删除
+								sysRoleMenuQueryWrapper.in("menu_id", disjunction);
 								sysRoleMenuService.remove(sysRoleMenuQueryWrapper);
 							}
-					for (SysRole sysRole : roleList) {
+						}
-						for (SysMenu menu : menus) {
+						for (String menu : menuids) {
 							SysRoleMenu sysRoleMenu = new SysRoleMenu();
 							sysRoleMenu.preInsert();
 							sysRoleMenu.setRoleId(sysRole.getId());
-							sysRoleMenu.setMenuId(menu.getId());
+							sysRoleMenu.setMenuId(menu);
 							sysRoleMenuService.save(sysRoleMenu);
 						}
 					}
@@ -329,7 +344,7 @@ public class SysLoginController extends BaseController {
 			for (SingleMenu singleMenu :
 					singleMenus) { //剔除掉不符合的
 				if(singleMenu.getVisible()!=null&&singleMenu.getStatus()!=null) {
-					if (singleMenu.getVisible().equals("1") && singleMenu.getStatus().equals("1")) {
+					if (singleMenu.getStatus().equals("1")) {
 						singleAllMenus.add(singleMenu);
 					}
 				}
@@ -337,7 +352,7 @@ public class SysLoginController extends BaseController {
 					List<SingleMenu> children = singleMenu.getChildren();
 					for (SingleMenu child : children) {
 						if(singleMenu.getVisible()!=null&&singleMenu.getStatus()!=null) {
-							if (singleMenu.getVisible().equals("1") && singleMenu.getStatus().equals("1")) {
+							if (singleMenu.getStatus().equals("1")) {
 								singleAllMenus.add(child);
 							}
 						}

jwtech-admin/src/main/java/com/kms/web/controller/tool/TestController.java

@@ -47,7 +47,7 @@ public class TestController extends BaseController
 
     @GetMapping("test")
     public WaterResult test(){
-        WaterResult waterResult = waterRequestUtil.getUserResource("bearer 8dfdea94-4eae-483a-baed-131b2bf8589f");
+        WaterResult waterResult = waterRequestUtil.getUserResource("bearer b6f84142-5a1a-4726-acff-3cc7344bb737");
         String data = waterResult.getData();
 //        String records = JSONObject.parseObject(data).getString("records");
 //        List<SingleUser> singleUserList = JSONObject.parseArray(records, SingleUser.class);

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

@@ -44,7 +44,9 @@ public interface BsSgcjsjdBuiProInfoMapper extends BaseMapper<BsSgcjsjdBuiProInf
                                            @Param("pageNum") int pageNum,
                                            @Param("pageSize") int pageSize);
 
-    IPage<BsSgcjsjdBuiProInfo> selectManagePage(@Param("id") String id,
+    IPage<BsSgcjsjdBuiProInfo> selectManagePage(@Param("userId") String userId,
+                                                @Param("userType") String userType,
+                                                @Param("id") String id,
                                                 @Param("projectName") String projectName,
                                                 @Param("isMajor") String isMajor,
                                                 @Param("projectType") String projectType,
@@ -72,9 +74,9 @@ public interface BsSgcjsjdBuiProInfoMapper extends BaseMapper<BsSgcjsjdBuiProInf
                        @Param("pageSize") int pageSize);
 
 
-    List<HistogramDto> getHistogram();
+    List<HistogramDto> getHistogram(@Param("userId")String userId,@Param("userType")String userType);
 
-    List<Num> getNum();
+    List<Num> getNum(@Param("userId")String userId,@Param("userType") String userType);
 
     FlowDto statistics(@Param("proNo") String proNo,
                        @Param("proCode") String proCode);

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

@@ -178,7 +178,7 @@ public class BsSgcjsjdBuiProInfoService extends BaseService<BsSgcjsjdBuiProInfoM
         IPage<BsSgcjsjdBuiProInfo> list = null;
 
 
-        list = bsSgcjsjdBuiProInfoMapper.selectManagePage(data.getId(), data.getProjectName(), isMajor, projectType,
+        list = bsSgcjsjdBuiProInfoMapper.selectManagePage(sysUser.getId(),sysUser.getUserType(),data.getId(), data.getProjectName(), isMajor, projectType,
                 sysXzqhService.getSubString(sp.getData().getAdcd()),
                 "create_time", new Page<>(sp.getPageNum(), sp.getPageSize()));
 
@@ -264,7 +264,7 @@ public class BsSgcjsjdBuiProInfoService extends BaseService<BsSgcjsjdBuiProInfoM
         IPage<BsSgcjsjdBuiProInfo> list = null;
 
 
-        list = bsSgcjsjdBuiProInfoMapper.selectManagePage(data.getId(), data.getProjectName(), isMajor, projectType,
+        list = bsSgcjsjdBuiProInfoMapper.selectManagePage(sysUser.getId(),sysUser.getUserType(),data.getId(), data.getProjectName(), isMajor, projectType,
                 sysXzqhService.getSubString(sp.getData().getAdcd()),
                 "create_time", new Page<>(sp.getPageNum(), sp.getPageSize()));
 
@@ -291,7 +291,8 @@ public class BsSgcjsjdBuiProInfoService extends BaseService<BsSgcjsjdBuiProInfoM
     }
 
     public HashMap<String, Use> getHistogram() {
-        List<HistogramDto> list = bsSgcjsjdBuiProInfoMapper.getHistogram();
+        SysUser user = UserUtils.getUser();
+        List<HistogramDto> list = bsSgcjsjdBuiProInfoMapper.getHistogram(user.getId(),user.getUserType());
         HashMap<String, Use> map = new HashMap<>();
         for (int i = 0; i < list.size(); i++) {
 
@@ -327,7 +328,8 @@ public class BsSgcjsjdBuiProInfoService extends BaseService<BsSgcjsjdBuiProInfoM
     }
 
     public NumberDto getNum() {
-        List<Num> dto=bsSgcjsjdBuiProInfoMapper.getNum();
+        SysUser user = UserUtils.getUser();
+        List<Num> dto=bsSgcjsjdBuiProInfoMapper.getNum(user.getId(),user.getUserType());
         NumberDto numDto = new NumberDto();
         for (Num num : dto) {
             if (num.getName().equals("ms")) {
@@ -337,8 +339,13 @@ public class BsSgcjsjdBuiProInfoService extends BaseService<BsSgcjsjdBuiProInfoM
                 numDto.setZd(Integer.valueOf(num.getNum()));
             }
         }
+        if (dto.size() > 1) {
             numDto.setNum(Integer.parseInt(dto.get(0).getNum())+Integer.parseInt(dto.get(1).getNum()));
 
+        }else {
+            numDto.setNum(Integer.parseInt(dto.get(0).getNum()));
+        }
+
 
         return numDto;
 

jwtech-system/src/main/java/com/kms/common/api/CommonApi.java

@@ -175,28 +175,21 @@ public class CommonApi {
         SysUser user = UserUtils.getUser();
         List<SysRole> sysRoles = sysRoleService.getRoleByUserId(user.getId());
         List<SysRole> legalPerson = sysRoles.stream().filter(x -> x.getRoleKey().equals("legalPerson")).collect(Collectors.toList());
-        List<SysRole> enterprise = sysRoles.stream().filter(x -> x.getRoleKey().equals("enterprise")).collect(Collectors.toList());
+//        List<SysRole> enterprise = sysRoles.stream().filter(x -> x.getRoleKey().equals("enterprise")).collect(Collectors.toList());
 
-        if (CollectionUtil.isEmpty(legalPerson)&&CollectionUtil.isEmpty(enterprise)) {
+        if (CollectionUtil.isEmpty(legalPerson)) {
             return AjaxResult.success(true);
-        } else if (CollectionUtil.isNotEmpty(legalPerson)){
+        } else{
             LambdaQueryWrapper<SysUserPro> queryWrapper = Wrappers.lambdaQuery(SysUserPro.class)
                     .eq(SysUserPro::getUserId, user.getId());
 
             List<SysUserPro> list = sysUserProService.list(queryWrapper);
             if (CollectionUtil.isEmpty(list)) {
                 return AjaxResult.success("项目",false);
-            } else if (CollectionUtil.isNotEmpty(list)&& list.stream().filter(x -> Objects.equals(x.getStatus(), "1")).count() == 0){
+            } /*else if (CollectionUtil.isNotEmpty(list)&& list.stream().filter(x -> Objects.equals(x.getStatus(), "1")).count() == 0){
                 return AjaxResult.error("审核未通过,请重新选择", false);
-            }else {
+            }*/
-                return AjaxResult.success(true);
+            else {
-            }
-        }else {
-            List<SysUserEnterprise> list = sysUserEnterpriseService.list(Wrappers.lambdaQuery(SysUserEnterprise.class)
-                    .eq(SysUserEnterprise::getUserId, user.getId()));
-            if (CollectionUtil.isEmpty(list)) {
-                return AjaxResult.success("企业",false);
-            } else {
                 return AjaxResult.success(true);
             }
         }

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

@@ -165,7 +165,17 @@
     <select id="selectManagePage" resultMap="projectManage">
 
         <include refid="projectMangeInfo"></include>
+        <if test="userType==01">
+            WHERE
+            pi.PRO_NO IN (
+            SELECT
+            PRO_NO
+            FROM
+            sys_user_pro
             <where>
+                <if test="userId!=null and userId!=''">
+                    AND user_id=#{userId})
+                </if>
                 <if test="projectName!=null and projectName!=''">
                     and pi.project_name like concat('%',#{projectName},'%')
                 </if>
@@ -178,6 +188,23 @@
                 <include refid="com.kms.system.mapper.SysXzqhMapper.xzqhCondition"></include>
             </where>
             order by pi.${orderBy} desc
+        </if>
+        <if test="userType==00">
+            <where>
+                <if test="projectName!=null and projectName!=''">
+                    and pi.project_name like concat('%',#{projectName},'%')
+                </if>
+                <if test="isMajor!=null and isMajor!=''">
+                    and pi.is_major=#{isMajor}
+                </if>
+                <if test="projectType!=null and projectType!=''">
+                    and pi.project_type=#{projectType}
+                </if>
+                <include refid="com.kms.system.mapper.SysXzqhMapper.xzqhCondition"></include>
+            </where>
+            order by pi.${orderBy} desc
+        </if>
+
     </select>
 
 
@@ -398,7 +425,19 @@
         AND pi.PRO_CODE = pp.PROJECT_CODE
         LEFT JOIN sys_xzqh sx ON pp.ADCD = sx.XZQHDM
         LEFT JOIN sys_xzqh xx ON sx.XZQHDM = xx.XZQHDM
-
+        <if test="userType==01">
+            WHERE
+            pi.PRO_NO IN (
+            SELECT
+            PRO_NO
+            FROM
+            sys_user_pro
+            <where>
+                <if test="userId!=null and userId!=''">
+                    AND user_id=#{userId})
+                </if>
+            </where>
+        </if>
         GROUP BY
         LEFT ( pp.ADCD, 4 ),pi.IS_MAJOR ) t LEFT JOIN sys_xzqh sy ON sy.XZQHDM = t.adcd;
     </select>
@@ -415,6 +454,19 @@
             bs_sgc_jsjd_bui_pro_info pi
                 LEFT JOIN bs_slgc_qqjd_spe_pro_proposal pp ON pi.PRO_NO = pp.PRO_NO
                 AND pi.PRO_CODE = pp.PROJECT_CODE
+        <if test="userType==01">
+            WHERE
+            pi.PRO_NO IN (
+            SELECT
+            PRO_NO
+            FROM
+            sys_user_pro
+            <where>
+                <if test="userId!=null and userId!=''">
+                    AND user_id=#{userId})
+                </if>
+            </where>
+        </if>
         GROUP BY pi.IS_MAJOR
     </select>
 

jwtech-system/src/main/resources/mapper/enterprise/BsSgcYxjdEnterpriseInfoMapper.xml

@@ -13,7 +13,8 @@
                establishment_date,
                legal_representative,
                corporate_id_number,
-               id
+               id,
+               unified_social_credit_code
         from bs_sgc_yxjd_enterprise_info ei
     </sql>
 
@@ -97,14 +98,14 @@
         </if>
         <if test="userType==05">
             WHERE
-            id IN (
+            unified_social_credit_code IN (
             SELECT
-            enterprise_id
+            sd.unified_social_credit_code
             FROM
-            sys_user_enterprise
+            sys_user su left join sys_dept sd on su.dept_id=sd.id
             <where>
                 <if test="userId!=null and userId!=''">
-                    AND user_id=#{userId})
+                    AND su.id=#{userId})
                 </if>
                 <if test="enterpriseName!=null and enterpriseName!=''">
                     and enterprise_name like concat('%',#{enterpriseName},'%')

jwtech-system/src/main/resources/mapper/system/SysDeptMapper.xml

@@ -39,7 +39,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select d.id,d.ip_start,d.ip_end,d.is_download,d.is_comment, d.parent_id, d.ancestors,
         d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status,d.tag,
         d.del_flag, d.create_uid, d.create_time, d.name, d.pc_logo, d.pc_background,
-        d.admin_name, d.admin_logo,d.data_type,d.begin_date,d.end_date,d.xzqh_id,d.xzqh_name,d.unifiedSocialCreditCode
+        d.admin_name, d.admin_logo,d.data_type,d.begin_date,d.end_date,d.xzqh_id,d.xzqh_name,d.unified_social_credit_code
         from sys_dept d
     </sql>
 
@@ -181,6 +181,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="ipEnd != null and ipEnd != ''">ip_end = #{ipEnd},</if>
  			<if test="ipStart != null and ipStart != ''">ip_start = #{ipStart},</if>
  			<if test="xzqhId != null and xzqhId != ''">xzqh_id = #{xzqhId},</if>
+ 		    <if test="unifiedSocialCreditCode!=null and unifiedSocialCreditCode!=''">unified_social_credit_code = #{unifiedSocialCreditCode},</if>
 			update_time = sysdate()
  		</set>
  		where id = #{id}