流程处理

jeecg-boot/jeecg-boot-module-activiti/src/main/java/org/jeecg/modules/activiti/mapper/xml/ActBusinessMapper.xml

@@ -25,10 +25,13 @@
                 act_z_business azb
                 left join ${map.tableName} cl on azb.table_id=cl.id
             WHERE
-                azb.user_id =#{map.userId}
-                AND azb.pk_org = #{map.pkOrg}
+
+                azb.pk_org = #{map.pkOrg}
                 AND azb.table_name=#{map.tableName}
 
+                <if test="map.userId!=null and map.userId!=''">
+                    AND azb.user_id =#{map.userId}
+                </if>
         	    <if test="map.tableName !='' and map.tableName !=null">
                     ${map.ortherParam}
                 </if>

jeecg-boot/jeecg-boot-module-activiti/src/main/java/org/jeecg/modules/activiti/web/ActBusinessController.java

@@ -569,6 +569,17 @@ public class ActBusinessController {
 
         Map<String,Object> map=new HashMap<>();
         map.put("userId",loginUser.getUsername());//当前登陆人
+        if(param.getTableName().equals("incident_ticket")){
+            map.put("userId",null);//当前登陆人
+        }
+        if(param.getTableName().equals("employee_leave")){
+            String userIds = sysBaseAPI.getUserByRoleCode("SY003",null);
+            if(StringUtils.isNotBlank(userIds)){
+                if(userIds.contains(loginUser.getUsername())){
+                    map.put("userId",null);//当前登陆人
+                }
+            }
+        }
         map.put("pkOrg",loginUser.getOrgCode());//公司id
         map.put("tableName",param.getTableName());//业务表单
         map.put("ortherParam",getPar(param));//高级查询条件

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/oa/service/impl/IncidentTicketServiceImpl.java

@@ -78,10 +78,10 @@ public class IncidentTicketServiceImpl extends ServiceImpl<IncidentTicketMapper,
 		}
 	}
 
-	public static void main(String[] args) {
-		String cCode=addOne("123");
-		System.out.println(cCode);
-	}
+//	public static void main(String[] args) {
+//		String cCode=addOne("123");
+//		System.out.println(cCode);
+//	}
 
 	@DS("master1")
 	@Override
@@ -692,6 +692,16 @@ public class IncidentTicketServiceImpl extends ServiceImpl<IncidentTicketMapper,
 		return resMap;
 	}
 
+	public static void main(String[] args) {
+
+		String aa = "qqq";
+		String nn = "qwe,qqq";
+
+		System.out.println(nn.contains(aa));
+
+	}
+
+
 	@Override
 	@Transactional
 	public Result<?> noticeUser(String ids,String headId,String code,String title){

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java

@@ -23,6 +23,7 @@ import org.jeecg.common.util.oss.OssBootUtil;
 import org.jeecg.modules.message.entity.SysMessageTemplate;
 import org.jeecg.modules.message.service.ISysMessageTemplateService;
 import org.jeecg.modules.message.websocket.WebSocket;
+import org.jeecg.modules.oa.entity.IncidentTicketChildren;
 import org.jeecg.modules.system.entity.*;
 import org.jeecg.modules.system.mapper.*;
 import org.jeecg.modules.system.service.ISysDataSourceService;
@@ -46,6 +47,7 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * @Description: 底层共通业务API，提供其他独立模块调用
@@ -680,4 +682,11 @@ public class SysBaseApiImpl implements ISysBaseAPI {
 		SysDepart sysDepart= sysDepartService.getById(sysUser.getOrgCode());
 		return sysDepartService.getDepartByUsernameByOrg(username,sysDepart.getOrgCode());
 	}
+
+	@Override
+	public String getUserByRoleCode(String roleCode, String username){
+		List<SysUser> userList = userMapper.getUserByRoleCode(roleCode,username);
+		String result = userList.stream().map(SysUser::getUsername).collect(Collectors.joining(","));
+		return result;
+	}
 }