commit：同步2.1版本

orange-demo-flowable/orange-demo-flowable-service/application-webadmin/src/main/java/com/flow/demo/webadmin/app/util/FlowDeptPostExtHelper.java

@@ -1,45 +0,0 @@
-package com.flow.demo.webadmin.app.util;
-
-import cn.hutool.core.collection.CollUtil;
-import com.flow.demo.common.flow.util.BaseFlowDeptPostExtHelper;
-import com.flow.demo.common.flow.util.FlowCustomExtFactory;
-import com.flow.demo.webadmin.upms.service.SysDeptService;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.PostConstruct;
-import java.util.List;
-
-/**
- * 为流程提供所需的部门岗位等扩展信息的帮助类。如本部门领导岗位和上级部门领导岗位。
- *
- * @author Jerry
- * @date 2021-06-06
- */
-@Slf4j
-@Component
-public class FlowDeptPostExtHelper implements BaseFlowDeptPostExtHelper {
-
-    @Autowired
-    private SysDeptService sysDeptService;
-    @Autowired
-    private FlowCustomExtFactory flowCustomExtFactory;
-
-    @PostConstruct
-    public void doRegister() {
-        flowCustomExtFactory.registerFlowDeptPostExtHelper(this);
-    }
-
-    @Override
-    public Long getLeaderDeptPostId(Long deptId) {
-        List<Long> deptPostIdList = sysDeptService.getLeaderDeptPostIdList(deptId);
-        return CollUtil.isEmpty(deptPostIdList) ? null : deptPostIdList.get(0);
-    }
-
-    @Override
-    public Long getUpLeaderDeptPostId(Long deptId) {
-        List<Long> deptPostIdList = sysDeptService.getUpLeaderDeptPostIdList(deptId);
-        return CollUtil.isEmpty(deptPostIdList) ? null : deptPostIdList.get(0);
-    }
-}

orange-demo-flowable/orange-demo-flowable-service/application-webadmin/src/main/java/com/orangeforms/webadmin/WebAdminApplication.java

@@ -1,4 +1,4 @@
-package com.flow.demo.webadmin;
+package com.orangeforms.webadmin;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -14,7 +14,7 @@ import org.springframework.scheduling.annotation.EnableAsync;
  */
 @EnableAsync
 @SpringBootApplication(exclude = {DataSourceAutoConfiguration.class})
-@ComponentScan("com.flow.demo")
+@ComponentScan("com.orangeforms")
 public class WebAdminApplication {
 
 	public static void main(String[] args) {

orange-demo-flowable/orange-demo-flowable-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/controller/AreaCodeController.java

@@ -1,10 +1,10 @@
-package com.flow.demo.webadmin.app.controller;
+package com.orangeforms.webadmin.app.controller;
 
 import cn.jimmyshi.beanquery.BeanQuery;
-import com.flow.demo.webadmin.app.model.AreaCode;
-import com.flow.demo.webadmin.app.service.AreaCodeService;
-import com.flow.demo.common.core.object.ResponseResult;
-import com.flow.demo.common.core.annotation.MyRequestBody;
+import com.orangeforms.webadmin.app.model.AreaCode;
+import com.orangeforms.webadmin.app.service.AreaCodeService;
+import com.orangeforms.common.core.object.ResponseResult;
+import com.orangeforms.common.core.annotation.MyRequestBody;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;

orange-demo-flowable/orange-demo-flowable-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/AreaCodeMapper.java

@@ -1,7 +1,7 @@
-package com.flow.demo.webadmin.app.dao;
+package com.orangeforms.webadmin.app.dao;
 
-import com.flow.demo.common.core.base.dao.BaseDaoMapper;
-import com.flow.demo.webadmin.app.model.AreaCode;
+import com.orangeforms.common.core.base.dao.BaseDaoMapper;
+import com.orangeforms.webadmin.app.model.AreaCode;
 
 /**
  * 行政区划数据操作访问接口。

orange-demo-flowable/orange-demo-flowable-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/dao/mapper/AreaCodeMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.flow.demo.webadmin.app.dao.AreaCodeMapper">
-    <resultMap id="BaseResultMap" type="com.flow.demo.webadmin.app.model.AreaCode">
+<mapper namespace="com.orangeforms.webadmin.app.dao.AreaCodeMapper">
+    <resultMap id="BaseResultMap" type="com.orangeforms.webadmin.app.model.AreaCode">
         <id column="area_id" jdbcType="BIGINT" property="areaId"/>
         <result column="area_name" jdbcType="VARCHAR" property="areaName"/>
         <result column="area_level" jdbcType="INTEGER" property="areaLevel"/>

orange-demo-flowable/orange-demo-flowable-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/model/AreaCode.java

@@ -1,4 +1,4 @@
-package com.flow.demo.webadmin.app.model;
+package com.orangeforms.webadmin.app.model;
 
 import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;

orange-demo-flowable/orange-demo-flowable-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/service/AreaCodeService.java

@@ -1,7 +1,7 @@
-package com.flow.demo.webadmin.app.service;
+package com.orangeforms.webadmin.app.service;
 
-import com.flow.demo.common.core.base.service.IBaseDictService;
-import com.flow.demo.webadmin.app.model.AreaCode;
+import com.orangeforms.common.core.base.service.IBaseDictService;
+import com.orangeforms.webadmin.app.model.AreaCode;
 
 import java.util.Collection;
 

orange-demo-flowable/orange-demo-flowable-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/service/impl/AreaCodeServiceImpl.java

@@ -1,11 +1,11 @@
-package com.flow.demo.webadmin.app.service.impl;
+package com.orangeforms.webadmin.app.service.impl;
 
-import com.flow.demo.webadmin.app.service.AreaCodeService;
-import com.flow.demo.webadmin.app.dao.AreaCodeMapper;
-import com.flow.demo.webadmin.app.model.AreaCode;
-import com.flow.demo.common.core.cache.MapTreeDictionaryCache;
-import com.flow.demo.common.core.base.service.BaseDictService;
-import com.flow.demo.common.core.base.dao.BaseDaoMapper;
+import com.orangeforms.webadmin.app.service.AreaCodeService;
+import com.orangeforms.webadmin.app.dao.AreaCodeMapper;
+import com.orangeforms.webadmin.app.model.AreaCode;
+import com.orangeforms.common.core.cache.MapTreeDictionaryCache;
+import com.orangeforms.common.core.base.service.BaseDictService;
+import com.orangeforms.common.core.base.dao.BaseDaoMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

orange-demo-flowable/orange-demo-flowable-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/util/FlowIdentityExtHelper.java

@@ -0,0 +1,135 @@
+package com.orangeforms.webadmin.app.util;
+
+import cn.hutool.core.collection.CollUtil;
+import com.orangeforms.common.flow.util.BaseFlowIdentityExtHelper;
+import com.orangeforms.common.flow.util.FlowCustomExtFactory;
+import com.orangeforms.webadmin.upms.model.SysDept;
+import com.orangeforms.webadmin.upms.model.SysUser;
+import com.orangeforms.webadmin.upms.model.constant.SysUserStatus;
+import com.orangeforms.webadmin.upms.model.SysDeptPost;
+import com.orangeforms.webadmin.upms.service.SysDeptService;
+import com.orangeforms.webadmin.upms.service.SysUserService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.PostConstruct;
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * 为流程提供所需的用户身份相关的等扩展信息的帮助类。
+ *
+ * @author Jerry
+ * @date 2021-06-06
+ */
+@Slf4j
+@Component
+public class FlowIdentityExtHelper implements BaseFlowIdentityExtHelper {
+
+    @Autowired
+    private SysDeptService sysDeptService;
+    @Autowired
+    private SysUserService sysUserService;
+    @Autowired
+    private FlowCustomExtFactory flowCustomExtFactory;
+
+    @PostConstruct
+    public void doRegister() {
+        flowCustomExtFactory.registerFlowIdentityExtHelper(this);
+    }
+
+    @Override
+    public Long getLeaderDeptPostId(Long deptId) {
+        List<Long> deptPostIdList = sysDeptService.getLeaderDeptPostIdList(deptId);
+        return CollUtil.isEmpty(deptPostIdList) ? null : deptPostIdList.get(0);
+    }
+
+    @Override
+    public Long getUpLeaderDeptPostId(Long deptId) {
+        List<Long> deptPostIdList = sysDeptService.getUpLeaderDeptPostIdList(deptId);
+        return CollUtil.isEmpty(deptPostIdList) ? null : deptPostIdList.get(0);
+    }
+
+    @Override
+    public Map<String, String> getDeptPostIdMap(Long deptId, Set<String> postIdSet) {
+        Set<Long> postIdSet2 = postIdSet.stream().map(Long::valueOf).collect(Collectors.toSet());
+        List<SysDeptPost> deptPostList = sysDeptService.getSysDeptPostList(deptId, postIdSet2);
+        if (CollUtil.isEmpty(deptPostList)) {
+            return null;
+        }
+        Map<String, String> resultMap = new HashMap<>(deptPostList.size());
+        deptPostList.forEach(sysDeptPost ->
+                resultMap.put(sysDeptPost.getPostId().toString(), sysDeptPost.getDeptPostId().toString()));
+        return resultMap;
+    }
+
+    @Override
+    public Map<String, String> getUpDeptPostIdMap(Long deptId, Set<String> postIdSet) {
+        SysDept sysDept = sysDeptService.getById(deptId);
+        if (sysDept == null || sysDept.getParentId() == null) {
+            return null;
+        }
+        return getDeptPostIdMap(sysDept.getParentId(), postIdSet);
+    }
+
+    @Override
+    public Set<String> getUsernameListByRoleIds(Set<String> roleIdSet) {
+        Set<String> usernameSet = new HashSet<>();
+        Set<Long> roleIdSet2 = roleIdSet.stream().map(Long::valueOf).collect(Collectors.toSet());
+        SysUser filter = new SysUser();
+        filter.setUserStatus(SysUserStatus.STATUS_NORMAL);
+        for (Long roleId : roleIdSet2) {
+            List<SysUser> userList = sysUserService.getSysUserListByRoleId(roleId, filter, null);
+            this.extractAndAppendUsernameList(usernameSet, userList);
+        }
+        return usernameSet;
+    }
+
+    @Override
+    public Set<String> getUsernameListByDeptIds(Set<String> deptIdSet) {
+        Set<String> usernameSet = new HashSet<>();
+        Set<Long> deptIdSet2 = deptIdSet.stream().map(Long::valueOf).collect(Collectors.toSet());
+        for (Long deptId : deptIdSet2) {
+            SysUser filter = new SysUser();
+            filter.setDeptId(deptId);
+            filter.setUserStatus(SysUserStatus.STATUS_NORMAL);
+            List<SysUser> userList = sysUserService.getSysUserList(filter, null);
+            this.extractAndAppendUsernameList(usernameSet, userList);
+        }
+        return usernameSet;
+    }
+
+    @Override
+    public Set<String> getUsernameListByPostIds(Set<String> postIdSet) {
+        Set<String> usernameSet = new HashSet<>();
+        Set<Long> postIdSet2 = postIdSet.stream().map(Long::valueOf).collect(Collectors.toSet());
+        SysUser filter = new SysUser();
+        filter.setUserStatus(SysUserStatus.STATUS_NORMAL);
+        for (Long postId : postIdSet2) {
+            List<SysUser> userList = sysUserService.getSysUserListByPostId(postId, filter, null);
+            this.extractAndAppendUsernameList(usernameSet, userList);
+        }
+        return usernameSet;
+    }
+
+    @Override
+    public Set<String> getUsernameListByDeptPostIds(Set<String> deptPostIdSet) {
+        Set<String> usernameSet = new HashSet<>();
+        Set<Long> deptPostIdSet2 = deptPostIdSet.stream().map(Long::valueOf).collect(Collectors.toSet());
+        SysUser filter = new SysUser();
+        filter.setUserStatus(SysUserStatus.STATUS_NORMAL);
+        for (Long deptPostId : deptPostIdSet2) {
+            List<SysUser> userList = sysUserService.getSysUserListByDeptPostId(deptPostId, filter, null);
+            this.extractAndAppendUsernameList(usernameSet, userList);
+        }
+        return usernameSet;
+    }
+
+    private void extractAndAppendUsernameList(Set<String> resultUsernameList, List<SysUser> userList) {
+        List<String> usernameList = userList.stream().map(SysUser::getLoginName).collect(Collectors.toList());
+        if (CollUtil.isNotEmpty(usernameList)) {
+            resultUsernameList.addAll(usernameList);
+        }
+    }
+}

orange-demo-flowable/orange-demo-flowable-service/application-webadmin/src/main/java/com/orangeforms/webadmin/app/vo/AreaCodeVo.java

@@ -1,4 +1,4 @@
-package com.flow.demo.webadmin.app.vo;
+package com.orangeforms.webadmin.app.vo;
 
 import lombok.Data;
 

orange-demo-flowable/orange-demo-flowable-service/application-webadmin/src/main/java/com/orangeforms/webadmin/config/ApplicationConfig.java

@@ -1,4 +1,4 @@
-package com.flow.demo.webadmin.config;
+package com.orangeforms.webadmin.config;
 
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;

orange-demo-flowable/orange-demo-flowable-service/application-webadmin/src/main/java/com/orangeforms/webadmin/config/DataSourceType.java

@@ -1,4 +1,4 @@
-package com.flow.demo.webadmin.config;
+package com.orangeforms.webadmin.config;
 
 import java.util.HashMap;
 import java.util.Map;

orange-demo-flowable/orange-demo-flowable-service/application-webadmin/src/main/java/com/orangeforms/webadmin/config/FilterConfig.java

@@ -1,4 +1,4 @@
-package com.flow.demo.webadmin.config;
+package com.orangeforms.webadmin.config;
 
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.boot.web.servlet.FilterRegistrationBean;

orange-demo-flowable/orange-demo-flowable-service/application-webadmin/src/main/java/com/orangeforms/webadmin/config/InterceptorConfig.java

@@ -1,6 +1,6 @@
-package com.flow.demo.webadmin.config;
+package com.orangeforms.webadmin.config;
 
-import com.flow.demo.webadmin.interceptor.AuthenticationInterceptor;
+import com.orangeforms.webadmin.interceptor.AuthenticationInterceptor;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;

orange-demo-flowable/orange-demo-flowable-service/application-webadmin/src/main/java/com/orangeforms/webadmin/config/MultiDataSourceConfig.java

@@ -1,7 +1,7 @@
-package com.flow.demo.webadmin.config;
+package com.orangeforms.webadmin.config;
 
 import com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceBuilder;
-import com.flow.demo.common.core.config.DynamicDataSource;
+import com.orangeforms.common.core.config.DynamicDataSource;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -21,7 +21,7 @@ import java.util.Map;
  */
 @Configuration
 @EnableTransactionManagement
-@MapperScan(value = {"com.flow.demo.webadmin.*.dao", "com.flow.demo.common.*.dao"})
+@MapperScan(value = {"com.orangeforms.webadmin.*.dao", "com.orangeforms.common.*.dao"})
 public class MultiDataSourceConfig {
 
     @Bean(initMethod = "init", destroyMethod = "close")

orange-demo-flowable/orange-demo-flowable-service/application-webadmin/src/main/java/com/orangeforms/webadmin/interceptor/AuthenticationInterceptor.java

@@ -1,17 +1,17 @@
-package com.flow.demo.webadmin.interceptor;
+package com.orangeforms.webadmin.interceptor;
 
 import com.alibaba.fastjson.JSON;
-import com.flow.demo.webadmin.config.ApplicationConfig;
-import com.flow.demo.webadmin.upms.model.SysPermWhitelist;
-import com.flow.demo.webadmin.upms.service.SysPermWhitelistService;
-import com.flow.demo.webadmin.upms.service.SysPermService;
-import com.flow.demo.common.core.annotation.NoAuthInterface;
-import com.flow.demo.common.core.constant.ErrorCodeEnum;
-import com.flow.demo.common.core.object.ResponseResult;
-import com.flow.demo.common.core.object.TokenData;
-import com.flow.demo.common.core.util.ApplicationContextHolder;
-import com.flow.demo.common.core.util.JwtUtil;
-import com.flow.demo.common.core.util.RedisKeyUtil;
+import com.orangeforms.webadmin.config.ApplicationConfig;
+import com.orangeforms.webadmin.upms.model.SysPermWhitelist;
+import com.orangeforms.webadmin.upms.service.SysPermWhitelistService;
+import com.orangeforms.webadmin.upms.service.SysPermService;
+import com.orangeforms.common.core.annotation.NoAuthInterface;
+import com.orangeforms.common.core.constant.ErrorCodeEnum;
+import com.orangeforms.common.core.object.ResponseResult;
+import com.orangeforms.common.core.object.TokenData;
+import com.orangeforms.common.core.util.ApplicationContextHolder;
+import com.orangeforms.common.core.util.JwtUtil;
+import com.orangeforms.common.core.util.RedisKeyUtil;
 import io.jsonwebtoken.Claims;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;

orange-demo-flowable/orange-demo-flowable-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/controller/LoginController.java

@@ -1,27 +1,27 @@
-package com.flow.demo.webadmin.upms.controller;
+package com.orangeforms.webadmin.upms.controller;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.serializer.SerializerFeature;
 import lombok.extern.slf4j.Slf4j;
-import com.flow.demo.webadmin.config.ApplicationConfig;
-import com.flow.demo.webadmin.upms.service.*;
-import com.flow.demo.webadmin.upms.model.*;
-import com.flow.demo.webadmin.upms.model.constant.SysUserStatus;
-import com.flow.demo.webadmin.upms.model.constant.SysUserType;
-import com.flow.demo.webadmin.upms.model.constant.SysMenuType;
-import com.flow.demo.webadmin.upms.model.constant.SysOnlineMenuPermType;
-import com.flow.demo.common.online.util.OnlineUtil;
-import com.flow.demo.common.online.model.OnlineDatasource;
-import com.flow.demo.common.online.service.OnlineDatasourceService;
-import com.flow.demo.common.online.api.config.OnlineApiProperties;
-import com.flow.demo.common.core.annotation.NoAuthInterface;
-import com.flow.demo.common.core.annotation.MyRequestBody;
-import com.flow.demo.common.core.constant.ApplicationConstant;
-import com.flow.demo.common.core.constant.ErrorCodeEnum;
-import com.flow.demo.common.core.object.*;
-import com.flow.demo.common.core.util.*;
-import com.flow.demo.common.redis.cache.SessionCacheHelper;
+import com.orangeforms.webadmin.config.ApplicationConfig;
+import com.orangeforms.webadmin.upms.service.*;
+import com.orangeforms.webadmin.upms.model.*;
+import com.orangeforms.webadmin.upms.model.constant.SysUserStatus;
+import com.orangeforms.webadmin.upms.model.constant.SysUserType;
+import com.orangeforms.webadmin.upms.model.constant.SysMenuType;
+import com.orangeforms.webadmin.upms.model.constant.SysOnlineMenuPermType;
+import com.orangeforms.common.online.util.OnlineUtil;
+import com.orangeforms.common.online.model.OnlineDatasource;
+import com.orangeforms.common.online.service.OnlineDatasourceService;
+import com.orangeforms.common.online.api.config.OnlineApiProperties;
+import com.orangeforms.common.core.annotation.NoAuthInterface;
+import com.orangeforms.common.core.annotation.MyRequestBody;
+import com.orangeforms.common.core.constant.ApplicationConstant;
+import com.orangeforms.common.core.constant.ErrorCodeEnum;
+import com.orangeforms.common.core.object.*;
+import com.orangeforms.common.core.util.*;
+import com.orangeforms.common.redis.cache.SessionCacheHelper;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.redisson.api.RBucket;
@@ -58,6 +58,8 @@ public class LoginController {
     @Autowired
     private SysPostService sysPostService;
     @Autowired
+    private SysRoleService sysRoleService;
+    @Autowired
     private SysDataPermService sysDataPermService;
     @Autowired
     private OnlineDatasourceService onlineDatasourceService;
@@ -206,6 +208,13 @@ public class LoginController {
         if (CollectionUtils.isNotEmpty(userPostList)) {
             Set<Long> deptPostIdSet = userPostList.stream().map(SysUserPost::getDeptPostId).collect(Collectors.toSet());
             tokenData.setDeptPostIds(StringUtils.join(deptPostIdSet, ","));
+            Set<Long> postIdSet = userPostList.stream().map(SysUserPost::getPostId).collect(Collectors.toSet());
+            tokenData.setPostIds(StringUtils.join(postIdSet, ","));
+        }
+        List<SysUserRole> userRoleList = sysRoleService.getSysUserRoleListByUserId(user.getUserId());
+        if (CollectionUtils.isNotEmpty(userRoleList)) {
+            Set<Long> userRoleIdSet = userRoleList.stream().map(SysUserRole::getRoleId).collect(Collectors.toSet());
+            tokenData.setRoleIds(StringUtils.join(userRoleIdSet, ","));
         }
         String sessionIdKey = RedisKeyUtil.makeSessionIdKey(sessionId);
         String sessionData = JSON.toJSONString(tokenData, SerializerFeature.WriteNonStringValueAsString);

orange-demo-flowable/orange-demo-flowable-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/controller/LoginUserController.java

@@ -1,11 +1,11 @@
-package com.flow.demo.webadmin.upms.controller;
+package com.orangeforms.webadmin.upms.controller;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
-import com.flow.demo.common.core.annotation.MyRequestBody;
-import com.flow.demo.common.core.object.*;
-import com.flow.demo.common.core.util.RedisKeyUtil;
+import com.orangeforms.common.core.annotation.MyRequestBody;
+import com.orangeforms.common.core.object.*;
+import com.orangeforms.common.core.util.RedisKeyUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.redisson.api.RBucket;
 import org.redisson.api.RedissonClient;

orange-demo-flowable/orange-demo-flowable-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/controller/SysDataPermController.java

@@ -1,22 +1,22 @@
-package com.flow.demo.webadmin.upms.controller;
+package com.orangeforms.webadmin.upms.controller;
 
 import com.alibaba.fastjson.TypeReference;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.page.PageMethod;
 import lombok.extern.slf4j.Slf4j;
-import com.flow.demo.webadmin.upms.dto.SysDataPermDto;
-import com.flow.demo.webadmin.upms.dto.SysUserDto;
-import com.flow.demo.webadmin.upms.vo.SysDataPermVo;
-import com.flow.demo.webadmin.upms.vo.SysUserVo;
-import com.flow.demo.webadmin.upms.model.SysDataPerm;
-import com.flow.demo.webadmin.upms.model.SysUser;
-import com.flow.demo.webadmin.upms.service.SysDataPermService;
-import com.flow.demo.webadmin.upms.service.SysUserService;
-import com.flow.demo.common.core.validator.UpdateGroup;
-import com.flow.demo.common.core.constant.ErrorCodeEnum;
-import com.flow.demo.common.core.object.*;
-import com.flow.demo.common.core.util.*;
-import com.flow.demo.common.core.annotation.MyRequestBody;
+import com.orangeforms.webadmin.upms.dto.SysDataPermDto;
+import com.orangeforms.webadmin.upms.dto.SysUserDto;
+import com.orangeforms.webadmin.upms.vo.SysDataPermVo;
+import com.orangeforms.webadmin.upms.vo.SysUserVo;
+import com.orangeforms.webadmin.upms.model.SysDataPerm;
+import com.orangeforms.webadmin.upms.model.SysUser;
+import com.orangeforms.webadmin.upms.service.SysDataPermService;
+import com.orangeforms.webadmin.upms.service.SysUserService;
+import com.orangeforms.common.core.validator.UpdateGroup;
+import com.orangeforms.common.core.constant.ErrorCodeEnum;
+import com.orangeforms.common.core.object.*;
+import com.orangeforms.common.core.util.*;
+import com.orangeforms.common.core.annotation.MyRequestBody;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 

orange-demo-flowable/orange-demo-flowable-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/controller/SysDeptController.java

@@ -1,15 +1,15 @@
-package com.flow.demo.webadmin.upms.controller;
+package com.orangeforms.webadmin.upms.controller;
 
 import cn.jimmyshi.beanquery.BeanQuery;
 import com.github.pagehelper.page.PageMethod;
-import com.flow.demo.webadmin.upms.vo.*;
-import com.flow.demo.webadmin.upms.dto.*;
-import com.flow.demo.webadmin.upms.model.*;
-import com.flow.demo.webadmin.upms.service.*;
-import com.flow.demo.common.core.object.*;
-import com.flow.demo.common.core.util.*;
-import com.flow.demo.common.core.constant.*;
-import com.flow.demo.common.core.annotation.MyRequestBody;
+import com.orangeforms.webadmin.upms.vo.*;
+import com.orangeforms.webadmin.upms.dto.*;
+import com.orangeforms.webadmin.upms.model.*;
+import com.orangeforms.webadmin.upms.service.*;
+import com.orangeforms.common.core.object.*;
+import com.orangeforms.common.core.util.*;
+import com.orangeforms.common.core.constant.*;
+import com.orangeforms.common.core.annotation.MyRequestBody;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -199,6 +199,7 @@ public class SysDeptController {
             sysPostList = sysPostService.getNotInSysPostListByDeptId(deptId, filter, orderBy);
         } else {
             sysPostList = sysPostService.getSysPostList(filter, orderBy);
+            sysPostService.buildRelationForDataList(sysPostList, MyRelationParam.dictOnly());
         }
         return ResponseResult.success(MyPageUtil.makeResponseData(sysPostList, SysPost.INSTANCE));
     }

orange-demo-flowable/orange-demo-flowable-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/controller/SysMenuController.java

@@ -1,18 +1,18 @@
-package com.flow.demo.webadmin.upms.controller;
+package com.orangeforms.webadmin.upms.controller;
 
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.TypeReference;
 import lombok.extern.slf4j.Slf4j;
-import com.flow.demo.webadmin.upms.dto.SysMenuDto;
-import com.flow.demo.webadmin.upms.vo.SysMenuVo;
-import com.flow.demo.webadmin.upms.model.SysMenu;
-import com.flow.demo.webadmin.upms.model.constant.SysMenuType;
-import com.flow.demo.webadmin.upms.service.SysMenuService;
-import com.flow.demo.common.core.constant.ErrorCodeEnum;
-import com.flow.demo.common.core.object.*;
-import com.flow.demo.common.core.util.*;
-import com.flow.demo.common.core.validator.UpdateGroup;
-import com.flow.demo.common.core.annotation.MyRequestBody;
+import com.orangeforms.webadmin.upms.dto.SysMenuDto;
+import com.orangeforms.webadmin.upms.vo.SysMenuVo;
+import com.orangeforms.webadmin.upms.model.SysMenu;
+import com.orangeforms.webadmin.upms.model.constant.SysMenuType;
+import com.orangeforms.webadmin.upms.service.SysMenuService;
+import com.orangeforms.common.core.constant.ErrorCodeEnum;
+import com.orangeforms.common.core.object.*;
+import com.orangeforms.common.core.util.*;
+import com.orangeforms.common.core.validator.UpdateGroup;
+import com.orangeforms.common.core.annotation.MyRequestBody;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 

orange-demo-flowable/orange-demo-flowable-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/controller/SysPermCodeController.java

@@ -1,16 +1,16 @@
-package com.flow.demo.webadmin.upms.controller;
+package com.orangeforms.webadmin.upms.controller;
 
 import com.alibaba.fastjson.TypeReference;
 import lombok.extern.slf4j.Slf4j;
-import com.flow.demo.webadmin.upms.dto.SysPermCodeDto;
-import com.flow.demo.webadmin.upms.vo.SysPermCodeVo;
-import com.flow.demo.webadmin.upms.model.SysPermCode;
-import com.flow.demo.webadmin.upms.service.SysPermCodeService;
-import com.flow.demo.common.core.constant.ErrorCodeEnum;
-import com.flow.demo.common.core.object.*;
-import com.flow.demo.common.core.util.*;
-import com.flow.demo.common.core.validator.UpdateGroup;
-import com.flow.demo.common.core.annotation.MyRequestBody;
+import com.orangeforms.webadmin.upms.dto.SysPermCodeDto;
+import com.orangeforms.webadmin.upms.vo.SysPermCodeVo;
+import com.orangeforms.webadmin.upms.model.SysPermCode;
+import com.orangeforms.webadmin.upms.service.SysPermCodeService;
+import com.orangeforms.common.core.constant.ErrorCodeEnum;
+import com.orangeforms.common.core.object.*;
+import com.orangeforms.common.core.util.*;
+import com.orangeforms.common.core.validator.UpdateGroup;
+import com.orangeforms.common.core.annotation.MyRequestBody;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.dao.DuplicateKeyException;
 import org.springframework.web.bind.annotation.*;

orange-demo-flowable/orange-demo-flowable-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/controller/SysPermController.java

@@ -1,17 +1,17 @@
-package com.flow.demo.webadmin.upms.controller;
+package com.orangeforms.webadmin.upms.controller;
 
 import com.github.pagehelper.Page;
 import com.github.pagehelper.page.PageMethod;
 import lombok.extern.slf4j.Slf4j;
-import com.flow.demo.webadmin.upms.dto.SysPermDto;
-import com.flow.demo.webadmin.upms.vo.SysPermVo;
-import com.flow.demo.webadmin.upms.model.SysPerm;
-import com.flow.demo.webadmin.upms.service.SysPermService;
-import com.flow.demo.common.core.constant.ErrorCodeEnum;
-import com.flow.demo.common.core.object.*;
-import com.flow.demo.common.core.util.*;
-import com.flow.demo.common.core.validator.UpdateGroup;
-import com.flow.demo.common.core.annotation.MyRequestBody;
+import com.orangeforms.webadmin.upms.dto.SysPermDto;
+import com.orangeforms.webadmin.upms.vo.SysPermVo;
+import com.orangeforms.webadmin.upms.model.SysPerm;
+import com.orangeforms.webadmin.upms.service.SysPermService;
+import com.orangeforms.common.core.constant.ErrorCodeEnum;
+import com.orangeforms.common.core.object.*;
+import com.orangeforms.common.core.util.*;
+import com.orangeforms.common.core.validator.UpdateGroup;
+import com.orangeforms.common.core.annotation.MyRequestBody;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 

orange-demo-flowable/orange-demo-flowable-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/controller/SysPermModuleController.java

@@ -1,16 +1,16 @@
-package com.flow.demo.webadmin.upms.controller;
+package com.orangeforms.webadmin.upms.controller;
 
 import lombok.extern.slf4j.Slf4j;
-import com.flow.demo.webadmin.upms.dto.SysPermModuleDto;
-import com.flow.demo.webadmin.upms.vo.SysPermModuleVo;
-import com.flow.demo.webadmin.upms.model.SysPerm;
-import com.flow.demo.webadmin.upms.model.SysPermModule;
-import com.flow.demo.webadmin.upms.service.SysPermModuleService;
-import com.flow.demo.common.core.constant.ErrorCodeEnum;
-import com.flow.demo.common.core.object.*;
-import com.flow.demo.common.core.util.*;
-import com.flow.demo.common.core.validator.UpdateGroup;
-import com.flow.demo.common.core.annotation.MyRequestBody;
+import com.orangeforms.webadmin.upms.dto.SysPermModuleDto;
+import com.orangeforms.webadmin.upms.vo.SysPermModuleVo;
+import com.orangeforms.webadmin.upms.model.SysPerm;
+import com.orangeforms.webadmin.upms.model.SysPermModule;
+import com.orangeforms.webadmin.upms.service.SysPermModuleService;
+import com.orangeforms.common.core.constant.ErrorCodeEnum;
+import com.orangeforms.common.core.object.*;
+import com.orangeforms.common.core.util.*;
+import com.orangeforms.common.core.validator.UpdateGroup;
+import com.orangeforms.common.core.annotation.MyRequestBody;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;

orange-demo-flowable/orange-demo-flowable-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/controller/SysPostController.java

@@ -1,16 +1,16 @@
-package com.flow.demo.webadmin.upms.controller;
+package com.orangeforms.webadmin.upms.controller;
 
 import cn.jimmyshi.beanquery.BeanQuery;
 import com.github.pagehelper.page.PageMethod;
-import com.flow.demo.common.core.object.*;
-import com.flow.demo.common.core.util.*;
-import com.flow.demo.common.core.constant.*;
-import com.flow.demo.common.core.annotation.MyRequestBody;
-import com.flow.demo.common.core.validator.UpdateGroup;
-import com.flow.demo.webadmin.upms.dto.SysPostDto;
-import com.flow.demo.webadmin.upms.model.SysPost;
-import com.flow.demo.webadmin.upms.service.SysPostService;
-import com.flow.demo.webadmin.upms.vo.SysPostVo;
+import com.orangeforms.common.core.object.*;
+import com.orangeforms.common.core.util.*;
+import com.orangeforms.common.core.constant.*;
+import com.orangeforms.common.core.annotation.MyRequestBody;
+import com.orangeforms.common.core.validator.UpdateGroup;
+import com.orangeforms.webadmin.upms.dto.SysPostDto;
+import com.orangeforms.webadmin.upms.model.SysPost;
+import com.orangeforms.webadmin.upms.service.SysPostService;
+import com.orangeforms.webadmin.upms.vo.SysPostVo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;

orange-demo-flowable/orange-demo-flowable-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/controller/SysRoleController.java

@@ -1,23 +1,24 @@
-package com.flow.demo.webadmin.upms.controller;
+package com.orangeforms.webadmin.upms.controller;
 
+import cn.jimmyshi.beanquery.BeanQuery;
 import com.alibaba.fastjson.TypeReference;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.page.PageMethod;
 import lombok.extern.slf4j.Slf4j;
-import com.flow.demo.webadmin.upms.dto.SysRoleDto;
-import com.flow.demo.webadmin.upms.dto.SysUserDto;
-import com.flow.demo.webadmin.upms.vo.SysRoleVo;
-import com.flow.demo.webadmin.upms.vo.SysUserVo;
-import com.flow.demo.webadmin.upms.model.SysRole;
-import com.flow.demo.webadmin.upms.model.SysUser;
-import com.flow.demo.webadmin.upms.model.SysUserRole;
-import com.flow.demo.webadmin.upms.service.SysRoleService;
-import com.flow.demo.webadmin.upms.service.SysUserService;
-import com.flow.demo.common.core.validator.UpdateGroup;
-import com.flow.demo.common.core.constant.ErrorCodeEnum;
-import com.flow.demo.common.core.object.*;
-import com.flow.demo.common.core.util.*;
-import com.flow.demo.common.core.annotation.MyRequestBody;
+import com.orangeforms.webadmin.upms.dto.SysRoleDto;
+import com.orangeforms.webadmin.upms.dto.SysUserDto;
+import com.orangeforms.webadmin.upms.vo.SysRoleVo;
+import com.orangeforms.webadmin.upms.vo.SysUserVo;
+import com.orangeforms.webadmin.upms.model.SysRole;
+import com.orangeforms.webadmin.upms.model.SysUser;
+import com.orangeforms.webadmin.upms.model.SysUserRole;
+import com.orangeforms.webadmin.upms.service.SysRoleService;
+import com.orangeforms.webadmin.upms.service.SysUserService;
+import com.orangeforms.common.core.validator.UpdateGroup;
+import com.orangeforms.common.core.constant.ErrorCodeEnum;
+import com.orangeforms.common.core.object.*;
+import com.orangeforms.common.core.util.*;
+import com.orangeforms.common.core.annotation.MyRequestBody;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -285,6 +286,34 @@ public class SysRoleController {
         return ResponseResult.success();
     }
 
+    /**
+     * 以字典形式返回全部角色管理数据集合。字典的键值为[roleId, roleName]。
+     * 白名单接口，登录用户均可访问。
+     *
+     * @param filter 过滤对象。
+     * @return 应答结果对象，包含的数据为 List<Map<String, String>>，map中包含两条记录，key的值分别是id和name，value对应具体数据。
+     */
+    @GetMapping("/listDict")
+    public ResponseResult<List<Map<String, Object>>> listDict(SysRole filter) {
+        List<SysRole> resultList = sysRoleService.getListByFilter(filter);
+        return ResponseResult.success(BeanQuery.select(
+                "roleId as id", "roleName as name").executeFrom(resultList));
+    }
+
+    /**
+     * 根据字典Id集合，获取查询后的字典数据。
+     *
+     * @param dictIds 字典Id集合。
+     * @return 应答结果对象，包含字典形式的数据集合。
+     */
+    @PostMapping("/listDictByIds")
+    public ResponseResult<List<Map<String, Object>>> listDictByIds(
+            @MyRequestBody(elementType = Long.class) List<Long> dictIds) {
+        List<SysRole> resultList = sysRoleService.getInList(new HashSet<>(dictIds));
+        return ResponseResult.success(BeanQuery.select(
+                "roleId as id", "roleName as name").executeFrom(resultList));
+    }
+
     /**
      * 查询角色的权限资源地址列表。同时返回详细的分配路径。
      *

orange-demo-flowable/orange-demo-flowable-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/controller/SysUserController.java

@@ -1,17 +1,16 @@
-package com.flow.demo.webadmin.upms.controller;
+package com.orangeforms.webadmin.upms.controller;
 
 import com.alibaba.fastjson.TypeReference;
 import com.github.pagehelper.page.PageMethod;
-import com.flow.demo.webadmin.upms.vo.*;
-import com.flow.demo.webadmin.upms.dto.*;
-import com.flow.demo.webadmin.upms.model.*;
-import com.flow.demo.webadmin.upms.service.*;
-import com.flow.demo.common.core.object.*;
-import com.flow.demo.common.core.util.*;
-import com.flow.demo.common.core.constant.*;
-import com.flow.demo.common.core.annotation.MyRequestBody;
-import com.flow.demo.common.core.validator.AddGroup;
-import com.flow.demo.webadmin.config.ApplicationConfig;
+import com.orangeforms.webadmin.upms.vo.*;
+import com.orangeforms.webadmin.upms.dto.*;
+import com.orangeforms.webadmin.upms.model.*;
+import com.orangeforms.webadmin.upms.service.*;
+import com.orangeforms.common.core.object.*;
+import com.orangeforms.common.core.util.*;
+import com.orangeforms.common.core.constant.*;
+import com.orangeforms.common.core.annotation.MyRequestBody;
+import com.orangeforms.webadmin.config.ApplicationConfig;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.beans.factory.annotation.Autowired;

orange-demo-flowable/orange-demo-flowable-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/SysDataPermDeptMapper.java

@@ -1,7 +1,7 @@
-package com.flow.demo.webadmin.upms.dao;
+package com.orangeforms.webadmin.upms.dao;
 
-import com.flow.demo.common.core.base.dao.BaseDaoMapper;
-import com.flow.demo.webadmin.upms.model.SysDataPermDept;
+import com.orangeforms.common.core.base.dao.BaseDaoMapper;
+import com.orangeforms.webadmin.upms.model.SysDataPermDept;
 
 /**
  * 数据权限与部门关系数据访问操作接口。

orange-demo-flowable/orange-demo-flowable-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/SysDataPermMapper.java

@@ -1,7 +1,7 @@
-package com.flow.demo.webadmin.upms.dao;
+package com.orangeforms.webadmin.upms.dao;
 
-import com.flow.demo.common.core.base.dao.BaseDaoMapper;
-import com.flow.demo.webadmin.upms.model.SysDataPerm;
+import com.orangeforms.common.core.base.dao.BaseDaoMapper;
+import com.orangeforms.webadmin.upms.model.SysDataPerm;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

orange-demo-flowable/orange-demo-flowable-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/SysDataPermUserMapper.java

@@ -1,7 +1,7 @@
-package com.flow.demo.webadmin.upms.dao;
+package com.orangeforms.webadmin.upms.dao;
 
-import com.flow.demo.common.core.base.dao.BaseDaoMapper;
-import com.flow.demo.webadmin.upms.model.SysDataPermUser;
+import com.orangeforms.common.core.base.dao.BaseDaoMapper;
+import com.orangeforms.webadmin.upms.model.SysDataPermUser;
 
 /**
  * 数据权限与用户关系数据访问操作接口。

orange-demo-flowable/orange-demo-flowable-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/SysDeptMapper.java

@@ -1,7 +1,7 @@
-package com.flow.demo.webadmin.upms.dao;
+package com.orangeforms.webadmin.upms.dao;
 
-import com.flow.demo.common.core.base.dao.BaseDaoMapper;
-import com.flow.demo.webadmin.upms.model.SysDept;
+import com.orangeforms.common.core.base.dao.BaseDaoMapper;
+import com.orangeforms.webadmin.upms.model.SysDept;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.*;

orange-demo-flowable/orange-demo-flowable-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/SysDeptPostMapper.java

@@ -1,7 +1,7 @@
-package com.flow.demo.webadmin.upms.dao;
+package com.orangeforms.webadmin.upms.dao;
 
-import com.flow.demo.common.core.base.dao.BaseDaoMapper;
-import com.flow.demo.webadmin.upms.model.SysDeptPost;
+import com.orangeforms.common.core.base.dao.BaseDaoMapper;
+import com.orangeforms.webadmin.upms.model.SysDeptPost;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -19,7 +19,7 @@ public interface SysDeptPostMapper extends BaseDaoMapper<SysDeptPost> {
      * 获取指定部门Id的部门岗位多对多关联数据列表，以及关联的部门和岗位数据。
      *
      * @param deptId 部门Id。如果参数为空则返回全部数据。
-     * @return 部门岗位多对多数量列表。
+     * @return 部门岗位多对多数据列表。
      */
     List<Map<String, Object>> getSysDeptPostListWithRelationByDeptId(@Param("deptId") Long deptId);
 

orange-demo-flowable/orange-demo-flowable-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/SysDeptRelationMapper.java

@@ -1,7 +1,7 @@
-package com.flow.demo.webadmin.upms.dao;
+package com.orangeforms.webadmin.upms.dao;
 
-import com.flow.demo.common.core.base.dao.BaseDaoMapper;
-import com.flow.demo.webadmin.upms.model.SysDeptRelation;
+import com.orangeforms.common.core.base.dao.BaseDaoMapper;
+import com.orangeforms.webadmin.upms.model.SysDeptRelation;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

orange-demo-flowable/orange-demo-flowable-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/SysMenuMapper.java

@@ -1,7 +1,7 @@
-package com.flow.demo.webadmin.upms.dao;
+package com.orangeforms.webadmin.upms.dao;
 
-import com.flow.demo.common.core.base.dao.BaseDaoMapper;
-import com.flow.demo.webadmin.upms.model.SysMenu;
+import com.orangeforms.common.core.base.dao.BaseDaoMapper;
+import com.orangeforms.webadmin.upms.model.SysMenu;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.*;

orange-demo-flowable/orange-demo-flowable-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/SysMenuPermCodeMapper.java

@@ -1,7 +1,7 @@
-package com.flow.demo.webadmin.upms.dao;
+package com.orangeforms.webadmin.upms.dao;
 
-import com.flow.demo.common.core.base.dao.BaseDaoMapper;
-import com.flow.demo.webadmin.upms.model.SysMenuPermCode;
+import com.orangeforms.common.core.base.dao.BaseDaoMapper;
+import com.orangeforms.webadmin.upms.model.SysMenuPermCode;
 
 /**
  * 菜单与权限字关系数据访问操作接口。

orange-demo-flowable/orange-demo-flowable-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/SysPermCodeMapper.java

@@ -1,7 +1,7 @@
-package com.flow.demo.webadmin.upms.dao;
+package com.orangeforms.webadmin.upms.dao;
 
-import com.flow.demo.common.core.base.dao.BaseDaoMapper;
-import com.flow.demo.webadmin.upms.model.SysPermCode;
+import com.orangeforms.common.core.base.dao.BaseDaoMapper;
+import com.orangeforms.webadmin.upms.model.SysPermCode;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

orange-demo-flowable/orange-demo-flowable-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/SysPermCodePermMapper.java

@@ -1,7 +1,7 @@
-package com.flow.demo.webadmin.upms.dao;
+package com.orangeforms.webadmin.upms.dao;
 
-import com.flow.demo.common.core.base.dao.BaseDaoMapper;
-import com.flow.demo.webadmin.upms.model.SysPermCodePerm;
+import com.orangeforms.common.core.base.dao.BaseDaoMapper;
+import com.orangeforms.webadmin.upms.model.SysPermCodePerm;
 
 /**
  * 权限字与权限资源关系数据访问操作接口。

orange-demo-flowable/orange-demo-flowable-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/SysPermMapper.java

@@ -1,7 +1,7 @@
-package com.flow.demo.webadmin.upms.dao;
+package com.orangeforms.webadmin.upms.dao;
 
-import com.flow.demo.common.core.base.dao.BaseDaoMapper;
-import com.flow.demo.webadmin.upms.model.SysPerm;
+import com.orangeforms.common.core.base.dao.BaseDaoMapper;
+import com.orangeforms.webadmin.upms.model.SysPerm;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.*;

orange-demo-flowable/orange-demo-flowable-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/SysPermModuleMapper.java

@@ -1,7 +1,7 @@
-package com.flow.demo.webadmin.upms.dao;
+package com.orangeforms.webadmin.upms.dao;
 
-import com.flow.demo.common.core.base.dao.BaseDaoMapper;
-import com.flow.demo.webadmin.upms.model.SysPermModule;
+import com.orangeforms.common.core.base.dao.BaseDaoMapper;
+import com.orangeforms.webadmin.upms.model.SysPermModule;
 
 import java.util.List;
 

orange-demo-flowable/orange-demo-flowable-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/SysPermWhitelistMapper.java

@@ -1,7 +1,7 @@
-package com.flow.demo.webadmin.upms.dao;
+package com.orangeforms.webadmin.upms.dao;
 
-import com.flow.demo.common.core.base.dao.BaseDaoMapper;
-import com.flow.demo.webadmin.upms.model.SysPermWhitelist;
+import com.orangeforms.common.core.base.dao.BaseDaoMapper;
+import com.orangeforms.webadmin.upms.model.SysPermWhitelist;
 
 /**
  * 权限资源白名单数据访问操作接口。

orange-demo-flowable/orange-demo-flowable-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/SysPostMapper.java

@@ -1,7 +1,7 @@
-package com.flow.demo.webadmin.upms.dao;
+package com.orangeforms.webadmin.upms.dao;
 
-import com.flow.demo.common.core.base.dao.BaseDaoMapper;
-import com.flow.demo.webadmin.upms.model.SysPost;
+import com.orangeforms.common.core.base.dao.BaseDaoMapper;
+import com.orangeforms.webadmin.upms.model.SysPost;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.*;

orange-demo-flowable/orange-demo-flowable-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/SysRoleMapper.java

@@ -1,7 +1,7 @@
-package com.flow.demo.webadmin.upms.dao;
+package com.orangeforms.webadmin.upms.dao;
 
-import com.flow.demo.common.core.base.dao.BaseDaoMapper;
-import com.flow.demo.webadmin.upms.model.SysRole;
+import com.orangeforms.common.core.base.dao.BaseDaoMapper;
+import com.orangeforms.webadmin.upms.model.SysRole;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.*;

orange-demo-flowable/orange-demo-flowable-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/SysRoleMenuMapper.java

@@ -1,7 +1,7 @@
-package com.flow.demo.webadmin.upms.dao;
+package com.orangeforms.webadmin.upms.dao;
 
-import com.flow.demo.common.core.base.dao.BaseDaoMapper;
-import com.flow.demo.webadmin.upms.model.SysRoleMenu;
+import com.orangeforms.common.core.base.dao.BaseDaoMapper;
+import com.orangeforms.webadmin.upms.model.SysRoleMenu;
 
 /**
  * 角色与菜单操作关联关系数据访问操作接口。

orange-demo-flowable/orange-demo-flowable-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/SysUserMapper.java

@@ -1,7 +1,7 @@
-package com.flow.demo.webadmin.upms.dao;
+package com.orangeforms.webadmin.upms.dao;
 
-import com.flow.demo.common.core.base.dao.BaseDaoMapper;
-import com.flow.demo.webadmin.upms.model.SysUser;
+import com.orangeforms.common.core.base.dao.BaseDaoMapper;
+import com.orangeforms.webadmin.upms.model.SysUser;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.*;
@@ -83,6 +83,45 @@ public interface SysUserMapper extends BaseDaoMapper<SysUser> {
             @Param("sysUserFilter") SysUser sysUserFilter,
             @Param("orderBy") String orderBy);
 
+    /**
+     * 根据部门岗位Id，获取关联的用户Id列表。
+     *
+     * @param deptPostId    关联的部门岗位Id。
+     * @param sysUserFilter 用户过滤条件对象。
+     * @param orderBy       order by从句的参数。
+     * @return 和DeptPostId关联的用户列表。
+     */
+    List<SysUser> getSysUserListByDeptPostId(
+            @Param("deptPostId") Long deptPostId,
+            @Param("sysUserFilter") SysUser sysUserFilter,
+            @Param("orderBy") String orderBy);
+
+    /**
+     * 根据部门岗位Id，获取和当前部门岗位Id没有建立多对多关联关系的用户Id列表。
+     *
+     * @param deptPostId    关联的部门岗位Id。
+     * @param sysUserFilter 用户过滤条件对象。
+     * @param orderBy       order by从句的参数。
+     * @return 和deptPostId没有建立关联关系的用户列表。
+     */
+    List<SysUser> getNotInSysUserListByDeptPostId(
+            @Param("deptPostId") Long deptPostId,
+            @Param("sysUserFilter") SysUser sysUserFilter,
+            @Param("orderBy") String orderBy);
+
+    /**
+     * 根据岗位Id，获取关联的用户Id列表。
+     *
+     * @param postId        关联的岗位Id。
+     * @param sysUserFilter 用户过滤条件对象。
+     * @param orderBy       order by从句的参数。
+     * @return 和postId关联的用户列表。
+     */
+    List<SysUser> getSysUserListByPostId(
+            @Param("postId") Long postId,
+            @Param("sysUserFilter") SysUser sysUserFilter,
+            @Param("orderBy") String orderBy);
+
     /**
      * 查询用户的权限资源地址列表。同时返回详细的分配路径。
      *

orange-demo-flowable/orange-demo-flowable-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/SysUserPostMapper.java

@@ -1,7 +1,7 @@
-package com.flow.demo.webadmin.upms.dao;
+package com.orangeforms.webadmin.upms.dao;
 
-import com.flow.demo.common.core.base.dao.BaseDaoMapper;
-import com.flow.demo.webadmin.upms.model.SysUserPost;
+import com.orangeforms.common.core.base.dao.BaseDaoMapper;
+import com.orangeforms.webadmin.upms.model.SysUserPost;
 
 /**
  * 用户岗位数据操作访问接口。

orange-demo-flowable/orange-demo-flowable-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/SysUserRoleMapper.java

@@ -1,7 +1,7 @@
-package com.flow.demo.webadmin.upms.dao;
+package com.orangeforms.webadmin.upms.dao;
 
-import com.flow.demo.common.core.base.dao.BaseDaoMapper;
-import com.flow.demo.webadmin.upms.model.SysUserRole;
+import com.orangeforms.common.core.base.dao.BaseDaoMapper;
+import com.orangeforms.webadmin.upms.model.SysUserRole;
 
 /**
  * 用户与角色关联关系数据访问操作接口。

orange-demo-flowable/orange-demo-flowable-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/mapper/SysDataPermDeptMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.flow.demo.webadmin.upms.dao.SysDataPermDeptMapper">
-    <resultMap id="BaseResultMap" type="com.flow.demo.webadmin.upms.model.SysDataPermDept">
+<mapper namespace="com.orangeforms.webadmin.upms.dao.SysDataPermDeptMapper">
+    <resultMap id="BaseResultMap" type="com.orangeforms.webadmin.upms.model.SysDataPermDept">
         <id column="data_perm_id" jdbcType="BIGINT" property="dataPermId"/>
         <id column="dept_id" jdbcType="BIGINT" property="deptId"/>
     </resultMap>

orange-demo-flowable/orange-demo-flowable-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/mapper/SysDataPermMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.flow.demo.webadmin.upms.dao.SysDataPermMapper">
-    <resultMap id="BaseResultMap" type="com.flow.demo.webadmin.upms.model.SysDataPerm">
+<mapper namespace="com.orangeforms.webadmin.upms.dao.SysDataPermMapper">
+    <resultMap id="BaseResultMap" type="com.orangeforms.webadmin.upms.model.SysDataPerm">
         <id column="data_perm_id" jdbcType="BIGINT" property="dataPermId"/>
         <result column="data_perm_name" jdbcType="VARCHAR" property="dataPermName"/>
         <result column="rule_type" jdbcType="INTEGER" property="ruleType"/>
@@ -12,10 +12,10 @@
         <result column="deleted_flag" jdbcType="INTEGER" property="deletedFlag"/>
     </resultMap>
 
-    <resultMap id="BaseResultMapEx" type="com.flow.demo.webadmin.upms.model.SysDataPerm" extends="BaseResultMap">
+    <resultMap id="BaseResultMapEx" type="com.orangeforms.webadmin.upms.model.SysDataPerm" extends="BaseResultMap">
         <collection property="dataPermDeptList" column="data_perm_id" javaType="ArrayList"
-                    ofType="com.flow.demo.webadmin.upms.model.SysDataPermDept" notNullColumn="dept_id"
-                    resultMap="com.flow.demo.webadmin.upms.dao.SysDataPermDeptMapper.BaseResultMap">
+                    ofType="com.orangeforms.webadmin.upms.model.SysDataPermDept" notNullColumn="dept_id"
+                    resultMap="com.orangeforms.webadmin.upms.dao.SysDataPermDeptMapper.BaseResultMap">
         </collection>
     </resultMap>
 
@@ -29,10 +29,10 @@
                 AND IFNULL(zz_sys_data_perm.data_perm_name, '') LIKE #{safeSearchString}
             </if>
         </if>
-        AND zz_sys_data_perm.deleted_flag = ${@com.flow.demo.common.core.constant.GlobalDeletedFlag@NORMAL}
+        AND zz_sys_data_perm.deleted_flag = ${@com.orangeforms.common.core.constant.GlobalDeletedFlag@NORMAL}
     </sql>
 
-    <select id="getSysDataPermList" resultMap="BaseResultMap" parameterType="com.flow.demo.webadmin.upms.model.SysDataPerm">
+    <select id="getSysDataPermList" resultMap="BaseResultMap" parameterType="com.orangeforms.webadmin.upms.model.SysDataPerm">
         SELECT
             zz_sys_data_perm.*
         FROM
@@ -45,7 +45,7 @@
         </if>
     </select>
 
-    <select id="getSysDataPermListByUserId" resultMap="BaseResultMapEx" parameterType="com.flow.demo.webadmin.upms.model.SysDataPerm">
+    <select id="getSysDataPermListByUserId" resultMap="BaseResultMapEx" parameterType="com.orangeforms.webadmin.upms.model.SysDataPerm">
         SELECT
             zz_sys_data_perm.*,
             zz_sys_data_perm_dept.*

orange-demo-flowable/orange-demo-flowable-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/mapper/SysDataPermUserMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.flow.demo.webadmin.upms.dao.SysDataPermUserMapper">
-    <resultMap id="BaseResultMap" type="com.flow.demo.webadmin.upms.model.SysDataPermUser">
+<mapper namespace="com.orangeforms.webadmin.upms.dao.SysDataPermUserMapper">
+    <resultMap id="BaseResultMap" type="com.orangeforms.webadmin.upms.model.SysDataPermUser">
         <id column="data_perm_id" jdbcType="BIGINT" property="dataPermId"/>
         <id column="user_id" jdbcType="BIGINT" property="userId"/>
     </resultMap>

orange-demo-flowable/orange-demo-flowable-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/mapper/SysDeptMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.flow.demo.webadmin.upms.dao.SysDeptMapper">
-    <resultMap id="BaseResultMap" type="com.flow.demo.webadmin.upms.model.SysDept">
+<mapper namespace="com.orangeforms.webadmin.upms.dao.SysDeptMapper">
+    <resultMap id="BaseResultMap" type="com.orangeforms.webadmin.upms.model.SysDept">
         <id column="dept_id" jdbcType="BIGINT" property="deptId"/>
         <result column="dept_name" jdbcType="VARCHAR" property="deptName"/>
         <result column="show_order" jdbcType="INTEGER" property="showOrder"/>
@@ -41,8 +41,8 @@
     <!-- 如果有逻辑删除字段过滤，请写到这里 -->
     <sql id="filterRef">
         <!-- 这里必须加上全包名，否则当filterRef被其他Mapper.xml包含引用的时候，就会调用Mapper.xml中的该SQL片段 -->
-        <include refid="com.flow.demo.webadmin.upms.dao.SysDeptMapper.inputFilterRef"/>
-        AND zz_sys_dept.deleted_flag = ${@com.flow.demo.common.core.constant.GlobalDeletedFlag@NORMAL}
+        <include refid="com.orangeforms.webadmin.upms.dao.SysDeptMapper.inputFilterRef"/>
+        AND zz_sys_dept.deleted_flag = ${@com.orangeforms.common.core.constant.GlobalDeletedFlag@NORMAL}
     </sql>
 
     <!-- 这里仅包含调用接口输入的主表过滤条件 -->
@@ -58,7 +58,7 @@
         </if>
     </sql>
 
-    <select id="getSysDeptList" resultMap="BaseResultMap" parameterType="com.flow.demo.webadmin.upms.model.SysDept">
+    <select id="getSysDeptList" resultMap="BaseResultMap" parameterType="com.orangeforms.webadmin.upms.model.SysDept">
         SELECT * FROM zz_sys_dept
         <where>
             <include refid="filterRef"/>

orange-demo-flowable/orange-demo-flowable-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/mapper/SysDeptPostMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.flow.demo.webadmin.upms.dao.SysDeptPostMapper">
-    <resultMap id="BaseResultMap" type="com.flow.demo.webadmin.upms.model.SysDeptPost">
+<mapper namespace="com.orangeforms.webadmin.upms.dao.SysDeptPostMapper">
+    <resultMap id="BaseResultMap" type="com.orangeforms.webadmin.upms.model.SysDeptPost">
         <id column="dept_post_id" jdbcType="BIGINT" property="deptPostId"/>
         <result column="dept_id" jdbcType="BIGINT" property="deptId"/>
         <result column="post_id" jdbcType="BIGINT" property="postId"/>

orange-demo-flowable/orange-demo-flowable-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/mapper/SysDeptRelationMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.flow.demo.webadmin.upms.dao.SysDeptRelationMapper">
-    <resultMap id="BaseResultMap" type="com.flow.demo.webadmin.upms.model.SysDeptRelation">
+<mapper namespace="com.orangeforms.webadmin.upms.dao.SysDeptRelationMapper">
+    <resultMap id="BaseResultMap" type="com.orangeforms.webadmin.upms.model.SysDeptRelation">
         <id column="parent_dept_id" jdbcType="BIGINT" property="parentDeptId"/>
         <id column="dept_id" jdbcType="BIGINT" property="deptId"/>
     </resultMap>

orange-demo-flowable/orange-demo-flowable-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/mapper/SysMenuMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.flow.demo.webadmin.upms.dao.SysMenuMapper">
-    <resultMap id="BaseResultMap" type="com.flow.demo.webadmin.upms.model.SysMenu">
+<mapper namespace="com.orangeforms.webadmin.upms.dao.SysMenuMapper">
+    <resultMap id="BaseResultMap" type="com.orangeforms.webadmin.upms.model.SysMenu">
         <id column="menu_id" jdbcType="BIGINT" property="menuId"/>
         <result column="parent_id" jdbcType="BIGINT" property="parentId"/>
         <result column="menu_name" jdbcType="VARCHAR" property="menuName"/>
@@ -30,7 +30,7 @@
             AND ur.user_id = #{userId}
             AND ur.role_id = rm.role_id
             AND rm.menu_id = m.menu_id
-            AND m.menu_type &lt;= ${@com.flow.demo.webadmin.upms.model.constant.SysMenuType@TYPE_MENU}
+            AND m.menu_type &lt;= ${@com.orangeforms.webadmin.upms.model.constant.SysMenuType@TYPE_MENU}
         </where>
         ORDER BY m.show_order
     </select>

orange-demo-flowable/orange-demo-flowable-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/mapper/SysMenuPermCodeMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.flow.demo.webadmin.upms.dao.SysMenuPermCodeMapper">
-    <resultMap id="BaseResultMap" type="com.flow.demo.webadmin.upms.model.SysMenuPermCode">
+<mapper namespace="com.orangeforms.webadmin.upms.dao.SysMenuPermCodeMapper">
+    <resultMap id="BaseResultMap" type="com.orangeforms.webadmin.upms.model.SysMenuPermCode">
         <id column="menu_id" jdbcType="BIGINT" property="menuId"/>
         <id column="perm_code_id" jdbcType="BIGINT" property="permCodeId"/>
     </resultMap>

orange-demo-flowable/orange-demo-flowable-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/mapper/SysPermCodeMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.flow.demo.webadmin.upms.dao.SysPermCodeMapper">
-    <resultMap id="BaseResultMap" type="com.flow.demo.webadmin.upms.model.SysPermCode">
+<mapper namespace="com.orangeforms.webadmin.upms.dao.SysPermCodeMapper">
+    <resultMap id="BaseResultMap" type="com.orangeforms.webadmin.upms.model.SysPermCode">
         <id column="perm_code_id" jdbcType="BIGINT" property="permCodeId"/>
         <result column="parent_id" jdbcType="BIGINT" property="parentId"/>
         <result column="perm_code" jdbcType="VARCHAR" property="permCode"/>

orange-demo-flowable/orange-demo-flowable-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/mapper/SysPermCodePermMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.flow.demo.webadmin.upms.dao.SysPermCodePermMapper">
-    <resultMap id="BaseResultMap" type="com.flow.demo.webadmin.upms.model.SysPermCodePerm">
+<mapper namespace="com.orangeforms.webadmin.upms.dao.SysPermCodePermMapper">
+    <resultMap id="BaseResultMap" type="com.orangeforms.webadmin.upms.model.SysPermCodePerm">
         <id column="perm_code_id" jdbcType="BIGINT" property="permCodeId"/>
         <id column="perm_id" jdbcType="BIGINT" property="permId"/>
     </resultMap>

orange-demo-flowable/orange-demo-flowable-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/mapper/SysPermMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.flow.demo.webadmin.upms.dao.SysPermMapper">
-    <resultMap id="BaseResultMap" type="com.flow.demo.webadmin.upms.model.SysPerm">
+<mapper namespace="com.orangeforms.webadmin.upms.dao.SysPermMapper">
+    <resultMap id="BaseResultMap" type="com.orangeforms.webadmin.upms.model.SysPerm">
         <id column="perm_id" jdbcType="BIGINT" property="permId"/>
         <result column="module_id" jdbcType="BIGINT" property="moduleId"/>
         <result column="perm_name" jdbcType="VARCHAR" property="permName"/>

orange-demo-flowable/orange-demo-flowable-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/mapper/SysPermModuleMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.flow.demo.webadmin.upms.dao.SysPermModuleMapper">
-    <resultMap id="BaseResultMap" type="com.flow.demo.webadmin.upms.model.SysPermModule">
+<mapper namespace="com.orangeforms.webadmin.upms.dao.SysPermModuleMapper">
+    <resultMap id="BaseResultMap" type="com.orangeforms.webadmin.upms.model.SysPermModule">
         <id column="module_id" jdbcType="BIGINT" property="moduleId"/>
         <result column="parent_id" jdbcType="BIGINT" property="parentId"/>
         <result column="module_name" jdbcType="VARCHAR" property="moduleName"/>
@@ -14,10 +14,10 @@
         <result column="deleted_flag" jdbcType="INTEGER" property="deletedFlag"/>
     </resultMap>
 
-    <resultMap id="BaseResultMapEx" type="com.flow.demo.webadmin.upms.model.SysPermModule" extends="BaseResultMap">
+    <resultMap id="BaseResultMapEx" type="com.orangeforms.webadmin.upms.model.SysPermModule" extends="BaseResultMap">
         <collection property="sysPermList" column="module_id" javaType="ArrayList"
-                    ofType="com.flow.demo.webadmin.upms.model.SysPerm" notNullColumn="perm_id"
-                    resultMap="com.flow.demo.webadmin.upms.dao.SysPermMapper.BaseResultMap">
+                    ofType="com.orangeforms.webadmin.upms.model.SysPerm" notNullColumn="perm_id"
+                    resultMap="com.orangeforms.webadmin.upms.dao.SysPermMapper.BaseResultMap">
         </collection>
     </resultMap>
 
@@ -34,9 +34,9 @@
         FROM
             zz_sys_perm_module pm
         LEFT JOIN
-            zz_sys_perm p ON pm.module_id = p.module_id AND p.deleted_flag = ${@com.flow.demo.common.core.constant.GlobalDeletedFlag@NORMAL}
+            zz_sys_perm p ON pm.module_id = p.module_id AND p.deleted_flag = ${@com.orangeforms.common.core.constant.GlobalDeletedFlag@NORMAL}
         <where>
-            AND pm.deleted_flag = ${@com.flow.demo.common.core.constant.GlobalDeletedFlag@NORMAL}
+            AND pm.deleted_flag = ${@com.orangeforms.common.core.constant.GlobalDeletedFlag@NORMAL}
         </where>
         ORDER BY
             pm.show_order, p.show_order

orange-demo-flowable/orange-demo-flowable-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/mapper/SysPermWhitelistMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.flow.demo.webadmin.upms.dao.SysPermWhitelistMapper">
-    <resultMap id="BaseResultMap" type="com.flow.demo.webadmin.upms.model.SysPermWhitelist">
+<mapper namespace="com.orangeforms.webadmin.upms.dao.SysPermWhitelistMapper">
+    <resultMap id="BaseResultMap" type="com.orangeforms.webadmin.upms.model.SysPermWhitelist">
         <id column="perm_url" jdbcType="VARCHAR" property="permUrl"/>
         <result column="module_name" jdbcType="VARCHAR" property="moduleName"/>
         <result column="perm_name" jdbcType="VARCHAR" property="permName"/>

orange-demo-flowable/orange-demo-flowable-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/mapper/SysPostMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.flow.demo.webadmin.upms.dao.SysPostMapper">
-    <resultMap id="BaseResultMap" type="com.flow.demo.webadmin.upms.model.SysPost">
+<mapper namespace="com.orangeforms.webadmin.upms.dao.SysPostMapper">
+    <resultMap id="BaseResultMap" type="com.orangeforms.webadmin.upms.model.SysPost">
         <id column="post_id" jdbcType="BIGINT" property="postId"/>
         <result column="post_name" jdbcType="VARCHAR" property="postName"/>
         <result column="level" jdbcType="INTEGER" property="level"/>
@@ -13,16 +13,16 @@
         <result column="deleted_flag" jdbcType="INTEGER" property="deletedFlag"/>
     </resultMap>
 
-    <resultMap id="BaseResultMapWithSysDeptPost" type="com.flow.demo.webadmin.upms.model.SysPost" extends="BaseResultMap">
+    <resultMap id="BaseResultMapWithSysDeptPost" type="com.orangeforms.webadmin.upms.model.SysPost" extends="BaseResultMap">
         <association property="sysDeptPost" column="post_id" foreignColumn="post_id"
-                     notNullColumn="post_id" resultMap="com.flow.demo.webadmin.upms.dao.SysDeptPostMapper.BaseResultMap" />
+                     notNullColumn="post_id" resultMap="com.orangeforms.webadmin.upms.dao.SysDeptPostMapper.BaseResultMap" />
     </resultMap>
 
     <!-- 如果有逻辑删除字段过滤，请写到这里 -->
     <sql id="filterRef">
         <!-- 这里必须加上全包名，否则当filterRef被其他Mapper.xml包含引用的时候，就会调用Mapper.xml中的该SQL片段 -->
-        <include refid="com.flow.demo.webadmin.upms.dao.SysPostMapper.inputFilterRef"/>
-        AND zz_sys_post.deleted_flag = ${@com.flow.demo.common.core.constant.GlobalDeletedFlag@NORMAL}
+        <include refid="com.orangeforms.webadmin.upms.dao.SysPostMapper.inputFilterRef"/>
+        AND zz_sys_post.deleted_flag = ${@com.orangeforms.common.core.constant.GlobalDeletedFlag@NORMAL}
     </sql>
 
     <!-- 这里仅包含调用接口输入的主表过滤条件 -->
@@ -38,7 +38,7 @@
         </if>
     </sql>
 
-    <select id="getSysPostList" resultMap="BaseResultMap" parameterType="com.flow.demo.webadmin.upms.model.SysPost">
+    <select id="getSysPostList" resultMap="BaseResultMap" parameterType="com.orangeforms.webadmin.upms.model.SysPost">
         SELECT * FROM zz_sys_post
         <where>
             <include refid="filterRef"/>

orange-demo-flowable/orange-demo-flowable-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/mapper/SysRoleMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.flow.demo.webadmin.upms.dao.SysRoleMapper">
-    <resultMap id="BaseResultMap" type="com.flow.demo.webadmin.upms.model.SysRole">
+<mapper namespace="com.orangeforms.webadmin.upms.dao.SysRoleMapper">
+    <resultMap id="BaseResultMap" type="com.orangeforms.webadmin.upms.model.SysRole">
         <id column="role_id" jdbcType="BIGINT" property="roleId"/>
         <result column="role_name" jdbcType="VARCHAR" property="roleName"/>
         <result column="create_user_id" jdbcType="BIGINT" property="createUserId"/>
@@ -18,10 +18,10 @@
                 AND role_name LIKE #{safeRoleName}
             </if>
         </if>
-        AND deleted_flag = ${@com.flow.demo.common.core.constant.GlobalDeletedFlag@NORMAL}
+        AND deleted_flag = ${@com.orangeforms.common.core.constant.GlobalDeletedFlag@NORMAL}
     </sql>
 
-    <select id="getSysRoleList" resultMap="BaseResultMap" parameterType="com.flow.demo.webadmin.upms.model.SysRole">
+    <select id="getSysRoleList" resultMap="BaseResultMap" parameterType="com.orangeforms.webadmin.upms.model.SysRole">
         SELECT * FROM zz_sys_role
         <where>
             <include refid="filterRef"/>

orange-demo-flowable/orange-demo-flowable-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/mapper/SysRoleMenuMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.flow.demo.webadmin.upms.dao.SysRoleMenuMapper">
-    <resultMap id="BaseResultMap" type="com.flow.demo.webadmin.upms.model.SysRoleMenu">
+<mapper namespace="com.orangeforms.webadmin.upms.dao.SysRoleMenuMapper">
+    <resultMap id="BaseResultMap" type="com.orangeforms.webadmin.upms.model.SysRoleMenu">
         <id column="role_id" jdbcType="BIGINT" property="roleId"/>
         <id column="menu_id" jdbcType="BIGINT" property="menuId"/>
     </resultMap>

orange-demo-flowable/orange-demo-flowable-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/mapper/SysUserMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.flow.demo.webadmin.upms.dao.SysUserMapper">
-    <resultMap id="BaseResultMap" type="com.flow.demo.webadmin.upms.model.SysUser">
+<mapper namespace="com.orangeforms.webadmin.upms.dao.SysUserMapper">
+    <resultMap id="BaseResultMap" type="com.orangeforms.webadmin.upms.model.SysUser">
         <id column="user_id" jdbcType="BIGINT" property="userId"/>
         <result column="login_name" jdbcType="VARCHAR" property="loginName"/>
         <result column="password" jdbcType="VARCHAR" property="password"/>
@@ -53,8 +53,8 @@
     <!-- 如果有逻辑删除字段过滤，请写到这里 -->
     <sql id="filterRef">
         <!-- 这里必须加上全包名，否则当filterRef被其他Mapper.xml包含引用的时候，就会调用Mapper.xml中的该SQL片段 -->
-        <include refid="com.flow.demo.webadmin.upms.dao.SysUserMapper.inputFilterRef"/>
-        AND zz_sys_user.deleted_flag = ${@com.flow.demo.common.core.constant.GlobalDeletedFlag@NORMAL}
+        <include refid="com.orangeforms.webadmin.upms.dao.SysUserMapper.inputFilterRef"/>
+        AND zz_sys_user.deleted_flag = ${@com.orangeforms.common.core.constant.GlobalDeletedFlag@NORMAL}
     </sql>
 
     <!-- 这里仅包含调用接口输入的主表过滤条件 -->
@@ -83,7 +83,7 @@
         </if>
     </sql>
 
-    <select id="getSysUserList" resultMap="BaseResultMap" parameterType="com.flow.demo.webadmin.upms.model.SysUser">
+    <select id="getSysUserList" resultMap="BaseResultMap" parameterType="com.orangeforms.webadmin.upms.model.SysUser">
         SELECT * FROM zz_sys_user
         <where>
             <include refid="filterRef"/>
@@ -149,6 +149,50 @@
         </if>
     </select>
 
+    <select id="getSysUserListByDeptPostId" resultMap="BaseResultMap">
+        SELECT
+            zz_sys_user.*
+        FROM
+            zz_sys_user_post,
+            zz_sys_user
+        <where>
+            AND zz_sys_user_post.dept_post_id = #{deptPostId}
+            AND zz_sys_user_post.user_id = zz_sys_user.user_id
+            <include refid="filterRef"/>
+        </where>
+        <if test="orderBy != null and orderBy != ''">
+            ORDER BY ${orderBy}
+        </if>
+    </select>
+
+    <select id="getNotInSysUserListByDeptPostId" resultMap="BaseResultMap">
+        SELECT * FROM zz_sys_user
+        <where>
+            NOT EXISTS (SELECT * FROM zz_sys_user_post
+                WHERE zz_sys_user_post.dept_post_id = #{deptPostId} AND zz_sys_user_post.user_id = zz_sys_user.user_id)
+            <include refid="filterRef"/>
+        </where>
+        <if test="orderBy != null and orderBy != ''">
+            ORDER BY ${orderBy}
+        </if>
+    </select>
+
+    <select id="getSysUserListByPostId" resultMap="BaseResultMap">
+        SELECT
+            zz_sys_user.*
+        FROM
+            zz_sys_user_post,
+            zz_sys_user
+        <where>
+            AND zz_sys_user_post.post_id = #{postId}
+            AND zz_sys_user_post.user_id = zz_sys_user.user_id
+            <include refid="filterRef"/>
+        </where>
+        <if test="orderBy != null and orderBy != ''">
+            ORDER BY ${orderBy}
+        </if>
+    </select>
+
     <!-- 以下查询仅用于权限分配的问题定位，由于关联表较多，可能会给系统运行带来性能影响 -->
     <select id="getSysPermListWithDetail" resultType="map">
         SELECT

orange-demo-flowable/orange-demo-flowable-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/mapper/SysUserPostMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.flow.demo.webadmin.upms.dao.SysUserPostMapper">
-    <resultMap id="BaseResultMap" type="com.flow.demo.webadmin.upms.model.SysUserPost">
+<mapper namespace="com.orangeforms.webadmin.upms.dao.SysUserPostMapper">
+    <resultMap id="BaseResultMap" type="com.orangeforms.webadmin.upms.model.SysUserPost">
         <id column="user_id" jdbcType="BIGINT" property="userId"/>
         <id column="dept_post_id" jdbcType="BIGINT" property="deptPostId"/>
         <id column="post_id" jdbcType="BIGINT" property="postId"/>

orange-demo-flowable/orange-demo-flowable-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dao/mapper/SysUserRoleMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.flow.demo.webadmin.upms.dao.SysUserRoleMapper">
-    <resultMap id="BaseResultMap" type="com.flow.demo.webadmin.upms.model.SysUserRole">
+<mapper namespace="com.orangeforms.webadmin.upms.dao.SysUserRoleMapper">
+    <resultMap id="BaseResultMap" type="com.orangeforms.webadmin.upms.model.SysUserRole">
         <id column="user_id" jdbcType="BIGINT" property="userId"/>
         <id column="role_id" jdbcType="BIGINT" property="roleId"/>
     </resultMap>

orange-demo-flowable/orange-demo-flowable-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dto/SysDataPermDeptDto.java

@@ -1,4 +1,4 @@
-package com.flow.demo.webadmin.upms.dto;
+package com.orangeforms.webadmin.upms.dto;
 
 import lombok.Data;
 

orange-demo-flowable/orange-demo-flowable-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dto/SysDataPermDto.java

@@ -1,8 +1,8 @@
-package com.flow.demo.webadmin.upms.dto;
+package com.orangeforms.webadmin.upms.dto;
 
-import com.flow.demo.common.core.validator.UpdateGroup;
-import com.flow.demo.common.core.validator.ConstDictRef;
-import com.flow.demo.common.datafilter.constant.DataPermRuleType;
+import com.orangeforms.common.core.validator.UpdateGroup;
+import com.orangeforms.common.core.validator.ConstDictRef;
+import com.orangeforms.common.datafilter.constant.DataPermRuleType;
 
 import lombok.Data;
 

orange-demo-flowable/orange-demo-flowable-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dto/SysDeptDto.java

@@ -1,11 +1,13 @@
-package com.flow.demo.webadmin.upms.dto;
+package com.orangeforms.webadmin.upms.dto;
 
-import com.flow.demo.common.core.validator.UpdateGroup;
+import com.orangeforms.common.core.validator.UpdateGroup;
 
 import lombok.Data;
 
 import javax.validation.constraints.*;
 
+import java.util.Date;
+
 /**
  * SysDeptDto对象。
  *
@@ -37,4 +39,24 @@ public class SysDeptDto {
      * 父部门Id。
      */
     private Long parentId;
+
+    /**
+     * 创建者Id。
+     */
+    private Long createUserId;
+
+    /**
+     * 更新者Id。
+     */
+    private Long updateUserId;
+
+    /**
+     * 创建时间。
+     */
+    private Date createTime;
+
+    /**
+     * 更新时间。
+     */
+    private Date updateTime;
 }

orange-demo-flowable/orange-demo-flowable-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dto/SysDeptPostDto.java

@@ -1,6 +1,6 @@
-package com.flow.demo.webadmin.upms.dto;
+package com.orangeforms.webadmin.upms.dto;
 
-import com.flow.demo.common.core.validator.UpdateGroup;
+import com.orangeforms.common.core.validator.UpdateGroup;
 
 import lombok.Data;
 

orange-demo-flowable/orange-demo-flowable-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dto/SysMenuDto.java

@@ -1,8 +1,8 @@
-package com.flow.demo.webadmin.upms.dto;
+package com.orangeforms.webadmin.upms.dto;
 
-import com.flow.demo.common.core.validator.ConstDictRef;
-import com.flow.demo.common.core.validator.UpdateGroup;
-import com.flow.demo.webadmin.upms.model.constant.SysMenuType;
+import com.orangeforms.common.core.validator.ConstDictRef;
+import com.orangeforms.common.core.validator.UpdateGroup;
+import com.orangeforms.webadmin.upms.model.constant.SysMenuType;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;

orange-demo-flowable/orange-demo-flowable-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dto/SysPermCodeDto.java

@@ -1,8 +1,8 @@
-package com.flow.demo.webadmin.upms.dto;
+package com.orangeforms.webadmin.upms.dto;
 
-import com.flow.demo.common.core.validator.ConstDictRef;
-import com.flow.demo.common.core.validator.UpdateGroup;
-import com.flow.demo.webadmin.upms.model.constant.SysPermCodeType;
+import com.orangeforms.common.core.validator.ConstDictRef;
+import com.orangeforms.common.core.validator.UpdateGroup;
+import com.orangeforms.webadmin.upms.model.constant.SysPermCodeType;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;

orange-demo-flowable/orange-demo-flowable-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dto/SysPermDto.java

@@ -1,6 +1,6 @@
-package com.flow.demo.webadmin.upms.dto;
+package com.orangeforms.webadmin.upms.dto;
 
-import com.flow.demo.common.core.validator.UpdateGroup;
+import com.orangeforms.common.core.validator.UpdateGroup;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;

orange-demo-flowable/orange-demo-flowable-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dto/SysPermModuleDto.java

@@ -1,8 +1,8 @@
-package com.flow.demo.webadmin.upms.dto;
+package com.orangeforms.webadmin.upms.dto;
 
-import com.flow.demo.common.core.validator.ConstDictRef;
-import com.flow.demo.common.core.validator.UpdateGroup;
-import com.flow.demo.webadmin.upms.model.constant.SysPermModuleType;
+import com.orangeforms.common.core.validator.ConstDictRef;
+import com.orangeforms.common.core.validator.UpdateGroup;
+import com.orangeforms.webadmin.upms.model.constant.SysPermModuleType;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;

orange-demo-flowable/orange-demo-flowable-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dto/SysPostDto.java

@@ -1,6 +1,6 @@
-package com.flow.demo.webadmin.upms.dto;
+package com.orangeforms.webadmin.upms.dto;
 
-import com.flow.demo.common.core.validator.UpdateGroup;
+import com.orangeforms.common.core.validator.UpdateGroup;
 
 import lombok.Data;
 

orange-demo-flowable/orange-demo-flowable-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dto/SysRoleDto.java

@@ -1,6 +1,6 @@
-package com.flow.demo.webadmin.upms.dto;
+package com.orangeforms.webadmin.upms.dto;
 
-import com.flow.demo.common.core.validator.UpdateGroup;
+import com.orangeforms.common.core.validator.UpdateGroup;
 import lombok.Data;
 
 import javax.validation.constraints.*;

orange-demo-flowable/orange-demo-flowable-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/dto/SysUserDto.java

@@ -1,15 +1,17 @@
-package com.flow.demo.webadmin.upms.dto;
+package com.orangeforms.webadmin.upms.dto;
 
-import com.flow.demo.common.core.validator.AddGroup;
-import com.flow.demo.common.core.validator.UpdateGroup;
-import com.flow.demo.common.core.validator.ConstDictRef;
-import com.flow.demo.webadmin.upms.model.constant.SysUserType;
-import com.flow.demo.webadmin.upms.model.constant.SysUserStatus;
+import com.orangeforms.common.core.validator.AddGroup;
+import com.orangeforms.common.core.validator.UpdateGroup;
+import com.orangeforms.common.core.validator.ConstDictRef;
+import com.orangeforms.webadmin.upms.model.constant.SysUserType;
+import com.orangeforms.webadmin.upms.model.constant.SysUserStatus;
 
 import lombok.Data;
 
 import javax.validation.constraints.*;
 
+import java.util.Date;
+
 /**
  * SysUserDto对象。
  *
@@ -68,6 +70,26 @@ public class SysUserDto {
     @ConstDictRef(constDictClass = SysUserStatus.class, message = "数据验证失败，用户状态(0: 正常 1: 锁定)为无效值！")
     private Integer userStatus;
 
+    /**
+     * 创建者Id。
+     */
+    private Long createUserId;
+
+    /**
+     * 更新者Id。
+     */
+    private Long updateUserId;
+
+    /**
+     * 创建时间。
+     */
+    private Date createTime;
+
+    /**
+     * 更新时间。
+     */
+    private Date updateTime;
+
     /**
      * createTime 范围过滤起始值(>=)。
      */

orange-demo-flowable/orange-demo-flowable-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/model/SysDataPerm.java

@@ -1,10 +1,10 @@
-package com.flow.demo.webadmin.upms.model;
+package com.orangeforms.webadmin.upms.model;
 
 import com.baomidou.mybatisplus.annotation.*;
-import com.flow.demo.common.core.util.MyCommonUtil;
-import com.flow.demo.common.core.annotation.RelationManyToMany;
-import com.flow.demo.common.core.base.mapper.BaseModelMapper;
-import com.flow.demo.webadmin.upms.vo.SysDataPermVo;
+import com.orangeforms.common.core.util.MyCommonUtil;
+import com.orangeforms.common.core.annotation.RelationManyToMany;
+import com.orangeforms.common.core.base.mapper.BaseModelMapper;
+import com.orangeforms.webadmin.upms.vo.SysDataPermVo;
 import lombok.Data;
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
@@ -96,7 +96,7 @@ public class SysDataPerm {
          * @param sysDataPermVo 域对象。
          * @return 实体对象。
          */
-        @Mapping(target = "dataPermDeptList", expression = "java(mapToBean(sysDataPermVo.getDataPermDeptList(), com.flow.demo.webadmin.upms.model.SysDataPermDept.class))")
+        @Mapping(target = "dataPermDeptList", expression = "java(mapToBean(sysDataPermVo.getDataPermDeptList(), com.orangeforms.webadmin.upms.model.SysDataPermDept.class))")
         @Override
         SysDataPerm toModel(SysDataPermVo sysDataPermVo);
         /**

orange-demo-flowable/orange-demo-flowable-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/model/SysDataPermDept.java

@@ -1,4 +1,4 @@
-package com.flow.demo.webadmin.upms.model;
+package com.orangeforms.webadmin.upms.model;
 
 import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;

orange-demo-flowable/orange-demo-flowable-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/model/SysDataPermUser.java

@@ -1,4 +1,4 @@
-package com.flow.demo.webadmin.upms.model;
+package com.orangeforms.webadmin.upms.model;
 
 import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;

orange-demo-flowable/orange-demo-flowable-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/model/SysDept.java

@@ -1,8 +1,8 @@
-package com.flow.demo.webadmin.upms.model;
+package com.orangeforms.webadmin.upms.model;
 
 import com.baomidou.mybatisplus.annotation.*;
-import com.flow.demo.common.core.base.mapper.BaseModelMapper;
-import com.flow.demo.webadmin.upms.vo.SysDeptVo;
+import com.orangeforms.common.core.base.mapper.BaseModelMapper;
+import com.orangeforms.webadmin.upms.vo.SysDeptVo;
 import lombok.Data;
 import org.mapstruct.*;
 import org.mapstruct.factory.Mappers;

orange-demo-flowable/orange-demo-flowable-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/model/SysDeptPost.java

@@ -1,4 +1,4 @@
-package com.flow.demo.webadmin.upms.model;
+package com.orangeforms.webadmin.upms.model;
 
 import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;

orange-demo-flowable/orange-demo-flowable-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/model/SysDeptRelation.java

@@ -1,4 +1,4 @@
-package com.flow.demo.webadmin.upms.model;
+package com.orangeforms.webadmin.upms.model;
 
 import com.baomidou.mybatisplus.annotation.*;
 import lombok.AllArgsConstructor;

orange-demo-flowable/orange-demo-flowable-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/model/SysMenu.java

@@ -1,9 +1,9 @@
-package com.flow.demo.webadmin.upms.model;
+package com.orangeforms.webadmin.upms.model;
 
 import com.baomidou.mybatisplus.annotation.*;
-import com.flow.demo.common.core.annotation.RelationManyToMany;
-import com.flow.demo.common.core.base.mapper.BaseModelMapper;
-import com.flow.demo.webadmin.upms.vo.SysMenuVo;
+import com.orangeforms.common.core.annotation.RelationManyToMany;
+import com.orangeforms.common.core.base.mapper.BaseModelMapper;
+import com.orangeforms.webadmin.upms.vo.SysMenuVo;
 import lombok.Data;
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
@@ -126,7 +126,7 @@ public class SysMenu {
          * @param sysMenuVo 域对象。
          * @return 实体对象。
          */
-        @Mapping(target = "sysMenuPermCodeList", expression = "java(mapToBean(sysMenuVo.getSysMenuPermCodeList(), com.flow.demo.webadmin.upms.model.SysMenuPermCode.class))")
+        @Mapping(target = "sysMenuPermCodeList", expression = "java(mapToBean(sysMenuVo.getSysMenuPermCodeList(), com.orangeforms.webadmin.upms.model.SysMenuPermCode.class))")
         @Override
         SysMenu toModel(SysMenuVo sysMenuVo);
         /**

orange-demo-flowable/orange-demo-flowable-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/model/SysMenuPermCode.java

@@ -1,4 +1,4 @@
-package com.flow.demo.webadmin.upms.model;
+package com.orangeforms.webadmin.upms.model;
 
 import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;

orange-demo-flowable/orange-demo-flowable-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/model/SysPerm.java

@@ -1,7 +1,7 @@
-package com.flow.demo.webadmin.upms.model;
+package com.orangeforms.webadmin.upms.model;
 
 import com.baomidou.mybatisplus.annotation.*;
-import com.flow.demo.common.core.annotation.RelationDict;
+import com.orangeforms.common.core.annotation.RelationDict;
 import lombok.Data;
 
 import java.util.*;

orange-demo-flowable/orange-demo-flowable-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/model/SysPermCode.java

@@ -1,9 +1,9 @@
-package com.flow.demo.webadmin.upms.model;
+package com.orangeforms.webadmin.upms.model;
 
 import com.baomidou.mybatisplus.annotation.*;
-import com.flow.demo.common.core.annotation.RelationManyToMany;
-import com.flow.demo.common.core.base.mapper.BaseModelMapper;
-import com.flow.demo.webadmin.upms.vo.SysPermCodeVo;
+import com.orangeforms.common.core.annotation.RelationManyToMany;
+import com.orangeforms.common.core.base.mapper.BaseModelMapper;
+import com.orangeforms.webadmin.upms.vo.SysPermCodeVo;
 import lombok.Data;
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
@@ -103,7 +103,7 @@ public class SysPermCode {
          * @param sysPermCodeVo 域对象。
          * @return 实体对象。
          */
-        @Mapping(target = "sysPermCodePermList", expression = "java(mapToBean(sysPermCodeVo.getSysPermCodePermList(), com.flow.demo.webadmin.upms.model.SysPermCodePerm.class))")
+        @Mapping(target = "sysPermCodePermList", expression = "java(mapToBean(sysPermCodeVo.getSysPermCodePermList(), com.orangeforms.webadmin.upms.model.SysPermCodePerm.class))")
         @Override
         SysPermCode toModel(SysPermCodeVo sysPermCodeVo);
         /**

orange-demo-flowable/orange-demo-flowable-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/model/SysPermCodePerm.java

@@ -1,4 +1,4 @@
-package com.flow.demo.webadmin.upms.model;
+package com.orangeforms.webadmin.upms.model;
 
 import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;

orange-demo-flowable/orange-demo-flowable-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/model/SysPermModule.java

@@ -1,4 +1,4 @@
-package com.flow.demo.webadmin.upms.model;
+package com.orangeforms.webadmin.upms.model;
 
 import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;

orange-demo-flowable/orange-demo-flowable-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/model/SysPermWhitelist.java

@@ -1,4 +1,4 @@
-package com.flow.demo.webadmin.upms.model;
+package com.orangeforms.webadmin.upms.model;
 
 import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;

orange-demo-flowable/orange-demo-flowable-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/model/SysPost.java

@@ -1,8 +1,8 @@
-package com.flow.demo.webadmin.upms.model;
+package com.orangeforms.webadmin.upms.model;
 
 import com.baomidou.mybatisplus.annotation.*;
-import com.flow.demo.common.core.base.mapper.BaseModelMapper;
-import com.flow.demo.webadmin.upms.vo.SysPostVo;
+import com.orangeforms.common.core.base.mapper.BaseModelMapper;
+import com.orangeforms.webadmin.upms.vo.SysPostVo;
 import lombok.Data;
 import org.mapstruct.*;
 import org.mapstruct.factory.Mappers;
@@ -87,7 +87,7 @@ public class SysPost {
          * @param sysPostVo 域对象。
          * @return 实体对象。
          */
-        @Mapping(target = "sysDeptPost", expression = "java(mapToBean(sysPostVo.getSysDeptPost(), com.flow.demo.webadmin.upms.model.SysDeptPost.class))")
+        @Mapping(target = "sysDeptPost", expression = "java(mapToBean(sysPostVo.getSysDeptPost(), com.orangeforms.webadmin.upms.model.SysDeptPost.class))")
         @Override
         SysPost toModel(SysPostVo sysPostVo);
         /**

orange-demo-flowable/orange-demo-flowable-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/model/SysRole.java

@@ -1,9 +1,9 @@
-package com.flow.demo.webadmin.upms.model;
+package com.orangeforms.webadmin.upms.model;
 
 import com.baomidou.mybatisplus.annotation.*;
-import com.flow.demo.common.core.annotation.RelationManyToMany;
-import com.flow.demo.common.core.base.mapper.BaseModelMapper;
-import com.flow.demo.webadmin.upms.vo.SysRoleVo;
+import com.orangeforms.common.core.annotation.RelationManyToMany;
+import com.orangeforms.common.core.base.mapper.BaseModelMapper;
+import com.orangeforms.webadmin.upms.vo.SysRoleVo;
 import lombok.Data;
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
@@ -79,7 +79,7 @@ public class SysRole {
          * @param sysRoleVo 域对象。
          * @return 实体对象。
          */
-        @Mapping(target = "sysRoleMenuList", expression = "java(mapToBean(sysRoleVo.getSysRoleMenuList(), com.flow.demo.webadmin.upms.model.SysRoleMenu.class))")
+        @Mapping(target = "sysRoleMenuList", expression = "java(mapToBean(sysRoleVo.getSysRoleMenuList(), com.orangeforms.webadmin.upms.model.SysRoleMenu.class))")
         @Override
         SysRole toModel(SysRoleVo sysRoleVo);
         /**

orange-demo-flowable/orange-demo-flowable-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/model/SysRoleMenu.java

@@ -1,4 +1,4 @@
-package com.flow.demo.webadmin.upms.model;
+package com.orangeforms.webadmin.upms.model;
 
 import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;

orange-demo-flowable/orange-demo-flowable-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/model/SysUser.java

@@ -1,13 +1,11 @@
-package com.flow.demo.webadmin.upms.model;
+package com.orangeforms.webadmin.upms.model;
 
 import com.baomidou.mybatisplus.annotation.*;
-import com.flow.demo.webadmin.upms.model.constant.SysUserType;
-import com.flow.demo.webadmin.upms.model.constant.SysUserStatus;
-import com.flow.demo.common.core.annotation.RelationDict;
-import com.flow.demo.common.core.annotation.RelationConstDict;
-import com.flow.demo.common.core.annotation.RelationManyToMany;
-import com.flow.demo.common.core.base.mapper.BaseModelMapper;
-import com.flow.demo.webadmin.upms.vo.SysUserVo;
+import com.orangeforms.webadmin.upms.model.constant.SysUserType;
+import com.orangeforms.webadmin.upms.model.constant.SysUserStatus;
+import com.orangeforms.common.core.annotation.*;
+import com.orangeforms.common.core.base.mapper.BaseModelMapper;
+import com.orangeforms.webadmin.upms.vo.SysUserVo;
 import lombok.Data;
 import org.mapstruct.*;
 import org.mapstruct.factory.Mappers;
@@ -175,9 +173,9 @@ public class SysUser {
          * @param sysUserVo 域对象。
          * @return 实体对象。
          */
-        @Mapping(target = "sysUserRoleList", expression = "java(mapToBean(sysUserVo.getSysUserRoleList(), com.flow.demo.webadmin.upms.model.SysUserRole.class))")
-        @Mapping(target = "sysUserPostList", expression = "java(mapToBean(sysUserVo.getSysUserPostList(), com.flow.demo.webadmin.upms.model.SysUserPost.class))")
-        @Mapping(target = "sysDataPermUserList", expression = "java(mapToBean(sysUserVo.getSysDataPermUserList(), com.flow.demo.webadmin.upms.model.SysDataPermUser.class))")
+        @Mapping(target = "sysUserRoleList", expression = "java(mapToBean(sysUserVo.getSysUserRoleList(), com.orangeforms.webadmin.upms.model.SysUserRole.class))")
+        @Mapping(target = "sysUserPostList", expression = "java(mapToBean(sysUserVo.getSysUserPostList(), com.orangeforms.webadmin.upms.model.SysUserPost.class))")
+        @Mapping(target = "sysDataPermUserList", expression = "java(mapToBean(sysUserVo.getSysDataPermUserList(), com.orangeforms.webadmin.upms.model.SysDataPermUser.class))")
         @Override
         SysUser toModel(SysUserVo sysUserVo);
         /**

orange-demo-flowable/orange-demo-flowable-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/model/SysUserPost.java

@@ -1,4 +1,4 @@
-package com.flow.demo.webadmin.upms.model;
+package com.orangeforms.webadmin.upms.model;
 
 import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;

orange-demo-flowable/orange-demo-flowable-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/model/SysUserRole.java

@@ -1,4 +1,4 @@
-package com.flow.demo.webadmin.upms.model;
+package com.orangeforms.webadmin.upms.model;
 
 import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;

orange-demo-flowable/orange-demo-flowable-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/model/constant/SysMenuType.java

@@ -1,4 +1,4 @@
-package com.flow.demo.webadmin.upms.model.constant;
+package com.orangeforms.webadmin.upms.model.constant;
 
 import java.util.HashMap;
 import java.util.Map;

orange-demo-flowable/orange-demo-flowable-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/model/constant/SysOnlineMenuPermType.java

@@ -1,4 +1,4 @@
-package com.flow.demo.webadmin.upms.model.constant;
+package com.orangeforms.webadmin.upms.model.constant;
 
 import java.util.HashMap;
 import java.util.Map;

orange-demo-flowable/orange-demo-flowable-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/model/constant/SysPermCodeType.java

@@ -1,4 +1,4 @@
-package com.flow.demo.webadmin.upms.model.constant;
+package com.orangeforms.webadmin.upms.model.constant;
 
 import java.util.HashMap;
 import java.util.Map;

orange-demo-flowable/orange-demo-flowable-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/model/constant/SysPermModuleType.java

@@ -1,4 +1,4 @@
-package com.flow.demo.webadmin.upms.model.constant;
+package com.orangeforms.webadmin.upms.model.constant;
 
 import java.util.HashMap;
 import java.util.Map;

orange-demo-flowable/orange-demo-flowable-service/application-webadmin/src/main/java/com/orangeforms/webadmin/upms/model/constant/SysUserStatus.java

@@ -1,4 +1,4 @@
-package com.flow.demo.webadmin.upms.model.constant;
+package com.orangeforms.webadmin.upms.model.constant;
 
 import java.util.HashMap;
 import java.util.Map;