提交代码

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));
         //模板数据

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

ruoyi-ui/src/views/wxsetting/wxAuth/index.vue

@@ -1,5 +1,7 @@
 <template>
   <div class="app-content">
+    <div> 
+    </div>
   </div>
 </template>
 
@@ -9,49 +11,55 @@ export default {
   data() {
     return {
       uId: null,
-        show: true,
-      dialogVisible: false,
-      bindPhoneVo: {
-        openId: '',
-        phone: ''
-      }
+      uIdErrorShow: false,
+      successVisible: false,
     };
   },
   watch: {},
   created() {
-    this.uId=this.getQueryString('userOpenId') || '';
+    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);
       } 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");
     },
     getQueryString(paramName) {
-      if(window.location.href.indexOf('?') == -1) return '';
-      let searchString = window.location.href.split('?')[1];
-      let i, val, params = searchString.split("&");
+      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>

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

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)

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>