From 963d86f209fb4cec79c5e2984c20fa1135812b7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A7=9C=E7=8E=89=E7=90=A6?=
 <7507756+jiang_yuqi@user.noreply.gitee.com>
Date: Mon, 8 Apr 2024 11:33:45 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../listener/GlobalEventListener.java         |   3 +-
 .../service/impl/SysUserServiceImpl.java      |  11 ----
 .../src/assets/images/loading-warning-red.png | Bin 0 -> 3851 bytes
 .../assets/images/loading-warning-yellow.png  | Bin 0 -> 3934 bytes
 ruoyi-ui/src/views/wxsetting/wxAuth/index.vue |  50 ++++++++++--------
 .../controller/ProjectFilesController.java    |   9 ++++
 .../com/yanzhu/jh/work/domain/WorkFile.java   |  10 ++++
 .../resources/mapper/work/WorkFileMapper.xml  |  14 +++++
 8 files changed, 63 insertions(+), 34 deletions(-)
 create mode 100644 ruoyi-ui/src/assets/images/loading-warning-red.png
 create mode 100644 ruoyi-ui/src/assets/images/loading-warning-yellow.png

diff --git a/ruoyi-flowable/src/main/java/com/ruoyi/flowable/listener/GlobalEventListener.java b/ruoyi-flowable/src/main/java/com/ruoyi/flowable/listener/GlobalEventListener.java
index 6d9fb5e7..bc067e40 100644
--- a/ruoyi-flowable/src/main/java/com/ruoyi/flowable/listener/GlobalEventListener.java
+++ b/ruoyi-flowable/src/main/java/com/ruoyi/flowable/listener/GlobalEventListener.java
@@ -80,8 +80,7 @@ public class GlobalEventListener extends AbstractFlowableEngineEventListener {
         log.info("任务流程审批完成...{}",event.getProcessInstanceId());
         super.processCompleted(event);
         List<WxMpTemplateMessage> list = new ArrayList<>();
-        TaskEntity taskEntity = (TaskEntity)event.getEntity();
-        ProcessInstance processInstance = runtimeService.createProcessInstanceQuery().processInstanceId(taskEntity.getProcessInstanceId()).singleResult();
+        ProcessInstance processInstance = runtimeService.createProcessInstanceQuery().processInstanceId(event.getProcessInstanceId()).singleResult();
         String startUserId = processInstance.getStartUserId();
         SysUser sysUser = sysUserMapper.selectUserById(Convert.toLong(startUserId));
         //模板数据
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
index d06059a4..341ab989 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
@@ -367,17 +367,6 @@ public class SysUserServiceImpl implements ISysUserService
     @Override
     public int resetPwd(SysUser user)
     {
-
-        List<Long> userIds = userMapper.selectUserByDept();
-        List<SysUserRole> sysUserRoleList = new ArrayList<>();
-        for(Long id:userIds){
-            SysUserRole sr = new SysUserRole();
-            sr.setUserId(id);
-            sr.setRoleId(48L);
-            sysUserRoleList.add(sr);
-        }
-        userRoleMapper.batchUserRole(sysUserRoleList);
-
         return userMapper.updateUser(user);
     }
 
diff --git a/ruoyi-ui/src/assets/images/loading-warning-red.png b/ruoyi-ui/src/assets/images/loading-warning-red.png
new file mode 100644
index 0000000000000000000000000000000000000000..598b40ab194eb6753f026bfbe2b84c008afd3555
GIT binary patch
literal 3851
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
N002ovPDHLkV1iPLdgK5A

literal 0
HcmV?d00001

diff --git a/ruoyi-ui/src/assets/images/loading-warning-yellow.png b/ruoyi-ui/src/assets/images/loading-warning-yellow.png
new file mode 100644
index 0000000000000000000000000000000000000000..3075796264dd0ddad10fc210856d9a3109c8e7e3
GIT binary patch
literal 3934
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

literal 0
HcmV?d00001

diff --git a/ruoyi-ui/src/views/wxsetting/wxAuth/index.vue b/ruoyi-ui/src/views/wxsetting/wxAuth/index.vue
index 3358eacc..0b9a8a82 100644
--- a/ruoyi-ui/src/views/wxsetting/wxAuth/index.vue
+++ b/ruoyi-ui/src/views/wxsetting/wxAuth/index.vue
@@ -1,5 +1,7 @@
 <template>
   <div class="app-content">
+    <div> 
+    </div>
   </div>
 </template>
 
@@ -8,50 +10,56 @@ export default {
   name: "build",
   data() {
     return {
-      uId:null,
-        show: true,
-      dialogVisible: false,
-      bindPhoneVo: {
-        openId: '',
-        phone: ''
-      }
+      uId: null,
+      uIdErrorShow: false,
+      successVisible: false,
     };
   },
   watch: {},
   created() {
-    this.uId=this.getQueryString('userOpenId') || '';
-    this.wechatLogin();
+    this.uId = this.getQueryString("userOpenId") || "";
+    if (this.uId == "") {
+    } else {
+      this.wechatLogin();
+    }
   },
   methods: {
     wechatLogin() {
       // 处理微信授权登录
-      let openId = this.getQueryString('openId') || '';
+      let openId = this.getQueryString("openId") || "";
       // token === '' && openId != '' 只要这种情况，未绑定账号
-      if(openId != '') {
+      if (openId != "") {
         // 绑定账号
-        console.log("dialogVisible===>",openId,this.uId);
+        console.log("dialogVisible===>", openId, this.uId);
       } else {
         // 如果绑定了，返回成功
         console.log("我要去登录了===>");
         let _baseUrl = "https://szgc.jhncidg.com";
-        window.location = _baseUrl + '/jhapi/wxAuth/authorize?returnUrl=' + _baseUrl + "/#/wxAuth?uid="+this.uId
+        window.location =
+          _baseUrl +
+          "/jhapi/wxAuth/authorize?returnUrl=" +
+          _baseUrl +
+          "/#/wxAuth?uid=" +
+          this.uId;
       }
     },
     saveBind() {
-        console.log("saveBind");
+      console.log("saveBind");
     },
-    getQueryString (paramName) {
-      if(window.location.href.indexOf('?') == -1) return '';
-      let searchString = window.location.href.split('?')[1];
-      let i, val, params = searchString.split("&");
-      for (i=0;i<params.length;i++) {
+    getQueryString(paramName) {
+      if (window.location.href.indexOf("?") == -1) return "";
+      let searchString = window.location.href.split("?")[1];
+      let i,
+        val,
+        params = searchString.split("&");
+      for (i = 0; i < params.length; i++) {
         val = params[i].split("=");
         if (val[0] == paramName) {
           return val[1];
         }
       }
-      return '';
-    }
+      return "";
+    },
   },
 };
 </script>
diff --git a/ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectFilesController.java b/ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectFilesController.java
index cf9b79f1..068eacdd 100644
--- a/ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectFilesController.java
+++ b/ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectFilesController.java
@@ -3,6 +3,7 @@ package com.ruoyi.web.project.controller;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.utils.StringUtils;
 import com.yanzhu.jh.work.domain.WorkFile;
 import com.yanzhu.jh.work.service.IWorkFileService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -12,6 +13,8 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -36,6 +39,9 @@ public class ProjectFilesController extends BaseController {
     public TableDataInfo list(WorkFile workFile)
     {
         startPage();
+        if(StringUtils.isNotBlank(workFile.getRemark())){
+            workFile.setDeptIds(new ArrayList(Arrays.asList(workFile.getRemark().split(","))));
+        }
         List<WorkFile> list = workFileService.selectWorkFileList(workFile);
         return getDataTable(list);
     }
@@ -48,6 +54,9 @@ public class ProjectFilesController extends BaseController {
     @GetMapping("/findCountByType")
     public AjaxResult findCountByType(WorkFile workFile){
         clearPage();
+        if(StringUtils.isNotBlank(workFile.getRemark())){
+            workFile.setDeptIds(new ArrayList(Arrays.asList(workFile.getRemark().split(","))));
+        }
         return success(workFileService.findCountByType(workFile));
     }
 
diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/work/domain/WorkFile.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/work/domain/WorkFile.java
index 75fdba91..80eedec4 100644
--- a/yanzhu-jh/src/main/java/com/yanzhu/jh/work/domain/WorkFile.java
+++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/work/domain/WorkFile.java
@@ -57,6 +57,8 @@ public class WorkFile extends BaseEntity
     @Excel(name = "阅读次数")
     private Long readNum;
 
+    private List<Long> deptIds;
+
     //文件列表
 
     private Long deptId;
@@ -179,6 +181,14 @@ public class WorkFile extends BaseEntity
         this.fileList = fileList;
     }
 
+    public List<Long> getDeptIds() {
+        return deptIds;
+    }
+
+    public void setDeptIds(List<Long> deptIds) {
+        this.deptIds = deptIds;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
diff --git a/yanzhu-jh/src/main/resources/mapper/work/WorkFileMapper.xml b/yanzhu-jh/src/main/resources/mapper/work/WorkFileMapper.xml
index 2e9d5ac5..a9c098af 100644
--- a/yanzhu-jh/src/main/resources/mapper/work/WorkFileMapper.xml
+++ b/yanzhu-jh/src/main/resources/mapper/work/WorkFileMapper.xml
@@ -38,6 +38,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="deptId != null  and deptId>0"> and dept_id = #{deptId}</if>
             <if test="fileName != null  and fileName != ''"> and file_name like concat('%', #{fileName}, '%')</if>
             <if test="params.beginMarksTime != null and params.beginMarksTime != '' and params.endMarksTime != null and params.endMarksTime != ''"> and create_time between #{params.beginMarksTime} and #{params.endMarksTime}</if>
+            <if test="deptIds !=null and deptIds.size()>0">
+                and (dept_id is null or dept_id in
+                <foreach collection="deptIds"  item="item" index="index" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+                )
+            </if>
         </where>
         order by create_time desc
     </select>
@@ -49,6 +56,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="deptId != null  and deptId>0"> and dept_id = #{deptId}</if>
             <if test="fileName != null  and fileName != ''"> and file_name like concat('%', #{fileName}, '%')</if>
             <if test="params.beginMarksTime != null and params.beginMarksTime != '' and params.endMarksTime != null and params.endMarksTime != ''"> and create_time between #{params.beginMarksTime} and #{params.endMarksTime}</if>
+            <if test="deptIds !=null and deptIds.size()>0">
+                and (dept_id is null or dept_id in
+                <foreach collection="deptIds"  item="item" index="index" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+                )
+            </if>
         </where>
         group by file_belong
     </select>