提交代码

ruoyi-wechat/src/main/java/com/ruoyi/web/userLogin/service/impl/WechatUserLoginServiceImpl.java

@@ -8,6 +8,7 @@ import com.ruoyi.common.core.redis.RedisCache;
 import com.ruoyi.common.core.text.Convert;
 import com.ruoyi.common.enums.DeptTypeEnum;
 import com.ruoyi.common.enums.SysRoleEnum;
+import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.framework.web.service.SysPermissionService;
@@ -116,6 +117,9 @@ public class WechatUserLoginServiceImpl implements IWechatUserLoginService {
         surProject.setNowRole(nowRole);
         surProject.setNowUser(Convert.toStr(userData.get("user_id")));
         List<SurProject> projectList  = surProjectMapper.selectSurProjectList(surProject);
+        if(projectList==null || projectList.size()==0){
+            throw new ServiceException("账号未关联到项目信息，无法继续登录。");
+        }
         //只有一个项目时直接保存项目信息
         if(projectList!=null && projectList.size()==1){
             Map<String,Object> projectInfo = new HashMap<>();

sql/SQL集合.txt

@@ -56,13 +56,23 @@ CREATE VIEW vw_flow_all AS (
 	ru.user_id AS startUserId,
 	ru.nick_name AS startUserName,
 	rd.dept_name AS startDeptName,
-	ht.*
+	RES.PROC_INST_ID_,
+	IFNULL(hr.ID_,ht.taskId) as taskId,
+	IFNULL(hr.NAME_,ht.taskName) as taskName,
+	IF(hr.ID_ IS NULL, ht.assigneeId, tu.user_id) as assigneeId,
+	IF(hr.ID_ IS NULL, ht.assigneeName, tu.nick_name) as assigneeName,
+	IF(hr.ID_ IS NULL, ht.assigneeDeptName, td.dept_name) as assigneeDeptName,
+	IF(hr.ID_ IS NULL, ht.taskComType, 0) as taskComType
 FROM
 	ACT_HI_PROCINST RES
 LEFT OUTER JOIN ACT_RE_PROCDEF DEF ON RES.PROC_DEF_ID_ = DEF.ID_
 LEFT OUTER JOIN sur_project sp ON RES.BUSINESS_KEY_ = sp.id
 LEFT JOIN sys_user ru ON ru.user_id = RES.START_USER_ID_
 LEFT JOIN sys_dept rd ON rd.dept_id = ru.dept_id
+LEFT JOIN act_ru_task hr ON hr.PROC_INST_ID_ = RES.PROC_INST_ID_
+LEFT JOIN act_ru_actinst ra ON ra.TASK_ID_ = hr.ID_ AND ra.PROC_INST_ID_ = RES.PROC_INST_ID_
+LEFT JOIN sys_user tu ON tu.user_id = ra.ASSIGNEE_
+LEFT JOIN sys_dept td ON td.dept_id = tu.dept_id
 LEFT JOIN (
 	SELECT
 		ht.ID_ AS taskId,
@@ -87,7 +97,6 @@ LEFT JOIN (
 				PROC_INST_ID_
 		)
 	GROUP BY ht.PROC_INST_ID_
-	
 ) ht ON ht.PROC_INST_ID_ = RES.PROC_INST_ID_
 )