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 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 userIds = userMapper.selectUserByDept(); - List 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 00000000..598b40ab Binary files /dev/null and b/ruoyi-ui/src/assets/images/loading-warning-red.png differ 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 00000000..30757962 Binary files /dev/null and b/ruoyi-ui/src/assets/images/loading-warning-yellow.png differ 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 @@ @@ -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 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 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 deptIds; + //文件列表 private Long deptId; @@ -179,6 +181,14 @@ public class WorkFile extends BaseEntity this.fileList = fileList; } + public List getDeptIds() { + return deptIds; + } + + public void setDeptIds(List 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" and dept_id = #{deptId} and file_name like concat('%', #{fileName}, '%') and create_time between #{params.beginMarksTime} and #{params.endMarksTime} + + and (dept_id is null or dept_id in + + #{item} + + ) + order by create_time desc @@ -49,6 +56,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and dept_id = #{deptId} and file_name like concat('%', #{fileName}, '%') and create_time between #{params.beginMarksTime} and #{params.endMarksTime} + + and (dept_id is null or dept_id in + + #{item} + + ) + group by file_belong