修改

gw-admin/src/main/java/com/goldenwater/web/controller/system/SysDeptController.java

@@ -25,7 +25,7 @@ import com.goldenwater.system.service.ISysDeptService;
 
 /**
  * 部门信息
- * 
+ *
  * @author goldenwater
  */
 @RestController
@@ -54,7 +54,7 @@ public class SysDeptController extends BaseController
     public AjaxResult excludeChild(@PathVariable(value = "deptId", required = false) Long deptId)
     {
         List<SysDept> depts = deptService.selectDeptList(new SysDept());
-        depts.removeIf(d -> d.getDeptId().intValue() == deptId || ArrayUtils.contains(StringUtils.split(d.getAncestors(), ","), deptId + ""));
+        depts.removeIf(d -> d.getDeptId().equals(deptId) || ArrayUtils.contains(StringUtils.split(d.getAncestors(), ","), deptId + ""));
         return success(depts);
     }
 
@@ -63,7 +63,7 @@ public class SysDeptController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:dept:query')")
     @GetMapping(value = "/{deptId}")
-    public AjaxResult getInfo(@PathVariable Long deptId)
+    public AjaxResult getInfo(@PathVariable String deptId)
     {
         deptService.checkDeptDataScope(deptId);
         return success(deptService.selectDeptById(deptId));
@@ -93,7 +93,7 @@ public class SysDeptController extends BaseController
     @PutMapping
     public AjaxResult edit(@Validated @RequestBody SysDept dept)
     {
-        Long deptId = dept.getDeptId();
+        String deptId = dept.getDeptId();
         deptService.checkDeptDataScope(deptId);
         if (!deptService.checkDeptNameUnique(dept))
         {
@@ -131,7 +131,7 @@ public class SysDeptController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:dept:remove')")
     @Log(title = "部门管理", businessType = BusinessType.DELETE)
     @DeleteMapping("/{deptId}")
-    public AjaxResult remove(@PathVariable Long deptId)
+    public AjaxResult remove(@PathVariable String deptId)
     {
         if (deptService.hasChildByDeptId(deptId))
         {

gw-admin/src/main/java/com/goldenwater/web/controller/system/SysLoginController.java

@@ -100,7 +100,7 @@ public class SysLoginController
     @GetMapping("getRouters")
     public AjaxResult getRouters()
     {
-        Long userId = SecurityUtils.getUserId();
+        String userId = SecurityUtils.getUserId();
         List<SysMenu> menus = menuService.selectMenuTreeByUserId(userId);
         return AjaxResult.success(menuService.buildMenus(menus));
     }

gw-admin/src/main/java/com/goldenwater/web/controller/system/SysNoticeController.java

@@ -91,7 +91,7 @@ public class SysNoticeController extends BaseController
     @ResponseBody
     public AjaxResult listTop()
     {
-        Long userId = getUserId();
+        String userId = getUserId();
         List<SysNotice> list = noticeReadService.selectNoticeListWithReadStatus(userId, 5);
         long unreadCount = list.stream().filter(n -> !n.getIsRead()).count();
         AjaxResult result = AjaxResult.success(list);
@@ -106,7 +106,7 @@ public class SysNoticeController extends BaseController
     @ResponseBody
     public AjaxResult markRead(Long noticeId)
     {
-        Long userId = getUserId();
+        String userId = getUserId();
         noticeReadService.markRead(noticeId, userId);
         return success();
     }
@@ -118,7 +118,7 @@ public class SysNoticeController extends BaseController
     @ResponseBody
     public AjaxResult markReadAll(String ids)
     {
-        Long userId = getUserId();
+        String userId = getUserId();
         Long[] noticeIds = Convert.toLongArray(ids);
         noticeReadService.markReadBatch(userId, noticeIds);
         return success();

gw-admin/src/main/java/com/goldenwater/web/controller/system/SysProfileController.java

@@ -64,7 +64,7 @@ public class SysProfileController extends BaseController
     {
         LoginUser loginUser = getLoginUser();
         SysUser currentUser = loginUser.getUser();
-        currentUser.setNickName(user.getNickName());
+        currentUser.setRealName(user.getRealName());
         currentUser.setEmail(user.getEmail());
         currentUser.setPhonenumber(user.getPhonenumber());
         currentUser.setSex(user.getSex());
@@ -95,7 +95,7 @@ public class SysProfileController extends BaseController
         String oldPassword = params.get("oldPassword");
         String newPassword = params.get("newPassword");
         LoginUser loginUser = getLoginUser();
-        Long userId = loginUser.getUserId();
+        String userId = loginUser.getUserId();
         SysUser user = userService.selectUserById(userId);
         String password = user.getPassword();
         if (!SecurityUtils.matchesPassword(oldPassword, password))

gw-admin/src/main/java/com/goldenwater/web/controller/system/SysRoleController.java

@@ -230,7 +230,7 @@ public class SysRoleController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:role:edit')")
     @Log(title = "角色管理", businessType = BusinessType.GRANT)
     @PutMapping("/authUser/cancelAll")
-    public AjaxResult cancelAuthUserAll(Long roleId, Long[] userIds)
+    public AjaxResult cancelAuthUserAll(Long roleId, String[] userIds)
     {
         return toAjax(roleService.deleteAuthUsers(roleId, userIds));
     }
@@ -241,7 +241,7 @@ public class SysRoleController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:role:edit')")
     @Log(title = "角色管理", businessType = BusinessType.GRANT)
     @PutMapping("/authUser/selectAll")
-    public AjaxResult selectAuthUserAll(Long roleId, Long[] userIds)
+    public AjaxResult selectAuthUserAll(Long roleId, String[] userIds)
     {
         roleService.checkRoleDataScope(roleId);
         return toAjax(roleService.insertAuthUsers(roleId, userIds));

gw-admin/src/main/java/com/goldenwater/web/controller/system/SysUserController.java

@@ -99,7 +99,7 @@ public class SysUserController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:user:query')")
     @GetMapping(value = { "/", "/{userId}" })
-    public AjaxResult getInfo(@PathVariable(value = "userId", required = false) Long userId)
+    public AjaxResult getInfo(@PathVariable(value = "userId", required = false) String userId)
     {
         AjaxResult ajax = AjaxResult.success();
         if (StringUtils.isNotNull(userId))
@@ -177,7 +177,7 @@ public class SysUserController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:user:remove')")
     @Log(title = "用户管理", businessType = BusinessType.DELETE)
     @DeleteMapping("/{userIds}")
-    public AjaxResult remove(@PathVariable Long[] userIds)
+    public AjaxResult remove(@PathVariable String[] userIds)
     {
         if (ArrayUtils.contains(userIds, getUserId()))
         {
@@ -220,7 +220,7 @@ public class SysUserController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:user:query')")
     @GetMapping("/authRole/{userId}")
-    public AjaxResult authRole(@PathVariable("userId") Long userId)
+    public AjaxResult authRole(@PathVariable("userId") String userId)
     {
         AjaxResult ajax = AjaxResult.success();
         SysUser user = userService.selectUserById(userId);
@@ -236,7 +236,7 @@ public class SysUserController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:user:edit')")
     @Log(title = "用户管理", businessType = BusinessType.GRANT)
     @PutMapping("/authRole")
-    public AjaxResult insertAuthRole(Long userId, Long[] roleIds)
+    public AjaxResult insertAuthRole(String userId, Long[] roleIds)
     {
         userService.checkUserDataScope(userId);
         roleService.checkRoleDataScope(roleIds);

gw-common/src/main/java/com/goldenwater/common/core/controller/BaseController.java

@@ -23,7 +23,7 @@ import com.goldenwater.common.utils.sql.SqlUtil;
 
 /**
  * web层通用数据处理
- * 
+ *
  * @author goldenwater
  */
 public class BaseController
@@ -113,7 +113,7 @@ public class BaseController
     {
         return AjaxResult.success(message);
     }
-    
+
     /**
      * 返回成功消息
      */
@@ -140,7 +140,7 @@ public class BaseController
 
     /**
      * 响应返回结果
-     * 
+     *
      * @param rows 影响行数
      * @return 操作结果
      */
@@ -151,7 +151,7 @@ public class BaseController
 
     /**
      * 响应返回结果
-     * 
+     *
      * @param result 结果
      * @return 操作结果
      */
@@ -179,7 +179,7 @@ public class BaseController
     /**
      * 获取登录用户id
      */
-    public Long getUserId()
+    public String getUserId()
     {
         return getLoginUser().getUserId();
     }
@@ -187,7 +187,7 @@ public class BaseController
     /**
      * 获取登录部门id
      */
-    public Long getDeptId()
+    public String getDeptId()
     {
         return getLoginUser().getDeptId();
     }

gw-common/src/main/java/com/goldenwater/common/core/domain/TreeSelect.java

@@ -11,7 +11,7 @@ import com.goldenwater.common.utils.StringUtils;
 
 /**
  * Treeselect树结构实体类
- * 
+ *
  * @author goldenwater
  */
 public class TreeSelect implements Serializable
@@ -19,7 +19,7 @@ public class TreeSelect implements Serializable
     private static final long serialVersionUID = 1L;
 
     /** 节点ID */
-    private Long id;
+    private String id;
 
     /** 节点名称 */
     private String label;
@@ -46,17 +46,17 @@ public class TreeSelect implements Serializable
 
     public TreeSelect(SysMenu menu)
     {
-        this.id = menu.getMenuId();
+        this.id = String.valueOf(menu.getMenuId());
         this.label = menu.getMenuName();
         this.children = menu.getChildren().stream().map(TreeSelect::new).collect(Collectors.toList());
     }
 
-    public Long getId()
+    public String getId()
     {
         return id;
     }
 
-    public void setId(Long id)
+    public void setId(String id)
     {
         this.id = id;
     }

gw-common/src/main/java/com/goldenwater/common/core/domain/entity/SysDept.java

@@ -12,7 +12,7 @@ import com.goldenwater.common.core.domain.BaseEntity;
 
 /**
  * 部门表 sys_dept
- * 
+ *
  * @author goldenwater
  */
 public class SysDept extends BaseEntity
@@ -20,10 +20,10 @@ public class SysDept extends BaseEntity
     private static final long serialVersionUID = 1L;
 
     /** 部门ID */
-    private Long deptId;
+    private String deptId;
 
     /** 父部门ID */
-    private Long parentId;
+    private String parentId;
 
     /** 祖级列表 */
     private String ancestors;
@@ -51,26 +51,26 @@ public class SysDept extends BaseEntity
 
     /** 父部门名称 */
     private String parentName;
-    
+
     /** 子部门 */
     private List<SysDept> children = new ArrayList<SysDept>();
 
-    public Long getDeptId()
+    public String getDeptId()
     {
         return deptId;
     }
 
-    public void setDeptId(Long deptId)
+    public void setDeptId(String deptId)
     {
         this.deptId = deptId;
     }
 
-    public Long getParentId()
+    public String getParentId()
     {
         return parentId;
     }
 
-    public void setParentId(Long parentId)
+    public void setParentId(String parentId)
     {
         this.parentId = parentId;
     }

gw-common/src/main/java/com/goldenwater/common/core/domain/entity/SysUser.java

@@ -16,7 +16,7 @@ import com.goldenwater.common.xss.Xss;
 
 /**
  * 用户对象 sys_user
- * 
+ *
  * @author goldenwater
  */
 public class SysUser extends BaseEntity
@@ -24,12 +24,12 @@ public class SysUser extends BaseEntity
     private static final long serialVersionUID = 1L;
 
     /** 用户ID */
-    @Excel(name = "用户序号", type = Type.EXPORT, cellType = ColumnType.NUMERIC, prompt = "用户编号")
-    private Long userId;
+    @Excel(name = "用户序号", type = Type.EXPORT, cellType = ColumnType.TEXT, prompt = "用户编号")
+    private String userId;
 
     /** 部门ID */
     @Excel(name = "部门编号", type = Type.IMPORT)
-    private Long deptId;
+    private String deptId;
 
     /** 用户账号 */
     @Excel(name = "登录名称")
@@ -37,7 +37,7 @@ public class SysUser extends BaseEntity
 
     /** 用户昵称 */
     @Excel(name = "用户名称")
-    private String nickName;
+    private String realName;
 
     /** 用户邮箱 */
     @Excel(name = "用户邮箱")
@@ -99,17 +99,17 @@ public class SysUser extends BaseEntity
 
     }
 
-    public SysUser(Long userId)
+    public SysUser(String userId)
     {
         this.userId = userId;
     }
 
-    public Long getUserId()
+    public String getUserId()
     {
         return userId;
     }
 
-    public void setUserId(Long userId)
+    public void setUserId(String userId)
     {
         this.userId = userId;
     }
@@ -119,26 +119,26 @@ public class SysUser extends BaseEntity
         return SecurityUtils.isAdmin(this.userId);
     }
 
-    public Long getDeptId()
+    public String getDeptId()
     {
         return deptId;
     }
 
-    public void setDeptId(Long deptId)
+    public void setDeptId(String deptId)
     {
         this.deptId = deptId;
     }
 
     @Xss(message = "用户昵称不能包含脚本字符")
     @Size(min = 0, max = 30, message = "用户昵称长度不能超过30个字符")
-    public String getNickName()
+    public String getRealName()
     {
-        return nickName;
+        return realName;
     }
 
-    public void setNickName(String nickName)
+    public void setRealName(String realName)
     {
-        this.nickName = nickName;
+        this.realName = realName;
     }
 
     @Xss(message = "用户账号不能包含脚本字符")
@@ -314,7 +314,7 @@ public class SysUser extends BaseEntity
             .append("userId", getUserId())
             .append("deptId", getDeptId())
             .append("userName", getUserName())
-            .append("nickName", getNickName())
+            .append("realName", getRealName())
             .append("email", getEmail())
             .append("phonenumber", getPhonenumber())
             .append("sex", getSex())

gw-common/src/main/java/com/goldenwater/common/core/domain/model/LoginUser.java

@@ -13,7 +13,7 @@ import com.goldenwater.common.core.domain.entity.SysUser;
 
 /**
  * 登录用户身份权限
- * 
+ *
  * @author goldenwater
  */
 public class LoginUser implements UserDetails
@@ -23,12 +23,12 @@ public class LoginUser implements UserDetails
     /**
      * 用户ID
      */
-    private Long userId;
+    private String userId;
 
     /**
      * 部门ID
      */
-    private Long deptId;
+    private String deptId;
 
     /**
      * 用户唯一标识
@@ -85,7 +85,7 @@ public class LoginUser implements UserDetails
         this.permissions = permissions;
     }
 
-    public LoginUser(Long userId, Long deptId, SysUser user, Set<String> permissions)
+    public LoginUser(String userId, String deptId, SysUser user, Set<String> permissions)
     {
         this.userId = userId;
         this.deptId = deptId;
@@ -93,22 +93,22 @@ public class LoginUser implements UserDetails
         this.permissions = permissions;
     }
 
-    public Long getUserId()
+    public String getUserId()
     {
         return userId;
     }
 
-    public void setUserId(Long userId)
+    public void setUserId(String userId)
     {
         this.userId = userId;
     }
 
-    public Long getDeptId()
+    public String getDeptId()
     {
         return deptId;
     }
 
-    public void setDeptId(Long deptId)
+    public void setDeptId(String deptId)
     {
         this.deptId = deptId;
     }
@@ -148,7 +148,7 @@ public class LoginUser implements UserDetails
 
     /**
      * 指定用户是否解锁,锁定的用户无法进行身份验证
-     * 
+     *
      * @return
      */
     @JSONField(serialize = false)
@@ -160,7 +160,7 @@ public class LoginUser implements UserDetails
 
     /**
      * 指示是否已过期的用户的凭据(密码),过期的凭据防止认证
-     * 
+     *
      * @return
      */
     @JSONField(serialize = false)
@@ -172,7 +172,7 @@ public class LoginUser implements UserDetails
 
     /**
      * 是否可用 ,禁用的用户不能身份验证
-     * 
+     *
      * @return
      */
     @JSONField(serialize = false)

gw-common/src/main/java/com/goldenwater/common/utils/SecurityUtils.java

@@ -15,7 +15,7 @@ import com.goldenwater.common.exception.ServiceException;
 
 /**
  * 安全服务工具类
- * 
+ *
  * @author goldenwater
  */
 public class SecurityUtils
@@ -24,7 +24,7 @@ public class SecurityUtils
     /**
      * 用户ID
      **/
-    public static Long getUserId()
+    public static String getUserId()
     {
         try
         {
@@ -39,7 +39,7 @@ public class SecurityUtils
     /**
      * 获取部门ID
      **/
-    public static Long getDeptId()
+    public static String getDeptId()
     {
         try
         {
@@ -116,7 +116,7 @@ public class SecurityUtils
 
     /**
      * 是否为管理员
-     * 
+     *
      * @return 结果
      */
     public static boolean isAdmin()
@@ -126,18 +126,18 @@ public class SecurityUtils
 
     /**
      * 是否为管理员
-     * 
+     *
      * @param userId 用户ID
      * @return 结果
      */
-    public static boolean isAdmin(Long userId)
+    public static boolean isAdmin(String userId)
     {
-        return userId != null && 1L == userId;
+        return userId != null && "1".equals(userId);
     }
 
     /**
      * 验证用户是否具备某权限
-     * 
+     *
      * @param permission 权限字符串
      * @return 用户是否具备某权限
      */
@@ -148,7 +148,7 @@ public class SecurityUtils
 
     /**
      * 判断是否包含权限
-     * 
+     *
      * @param authorities 权限列表
      * @param permission 权限字符串
      * @return 用户是否具备某权限
@@ -161,7 +161,7 @@ public class SecurityUtils
 
     /**
      * 验证用户是否拥有某个角色
-     * 
+     *
      * @param role 角色标识
      * @return 用户是否具备某角色
      */
@@ -174,7 +174,7 @@ public class SecurityUtils
 
     /**
      * 判断是否包含角色
-     * 
+     *
      * @param roles 角色列表
      * @param role 角色
      * @return 用户是否具备某角色权限

gw-framework/src/main/java/com/goldenwater/framework/web/service/SysLoginService.java

@@ -169,7 +169,7 @@ public class SysLoginService
      *
      * @param userId 用户ID
      */
-    public void recordLoginInfo(Long userId)
+    public void recordLoginInfo(String userId)
     {
         userService.updateLoginInfo(userId, IpUtils.getIpAddr(), DateUtils.getNowDate());
     }

gw-framework/src/main/java/com/goldenwater/framework/web/service/SysRegisterService.java

@@ -76,7 +76,7 @@ public class SysRegisterService
         }
         else
         {
-            sysUser.setNickName(username);
+            sysUser.setRealName(username);
             sysUser.setPwdUpdateDate(DateUtils.getNowDate());
             sysUser.setPassword(SecurityUtils.encryptPassword(password));
             boolean regFlag = userService.registerUser(sysUser);

gw-quartz/src/main/resources/mapper/quartz/SysJobLogMapper.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?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">
@@ -26,7 +26,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<include refid="selectJobLogVo"/>
 		<where>
 			<if test="jobName != null and jobName != ''">
-				AND job_name like concat('%', #{jobName}, '%')
+				AND job_name like '%' || #{jobName} || '%'
 			</if>
 			<if test="jobGroup != null and jobGroup != ''">
 				AND job_group = #{jobGroup}
@@ -35,7 +35,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 				AND status = #{status}
 			</if>
 			<if test="invokeTarget != null and invokeTarget != ''">
-				AND invoke_target like concat('%', #{invokeTarget}, '%')
+				AND invoke_target like '%' || #{invokeTarget} || '%'
 			</if>
 			<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
 				and date_format(create_time,'%Y%m%d') &gt;= date_format(#{params.beginTime},'%Y%m%d')

gw-quartz/src/main/resources/mapper/quartz/SysJobMapper.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?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">
@@ -29,7 +29,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<include refid="selectJobVo"/>
 		<where>
 			<if test="jobName != null and jobName != ''">
-				AND job_name like concat('%', #{jobName}, '%')
+				AND job_name like '%' || #{jobName} || '%'
 			</if>
 			<if test="jobGroup != null and jobGroup != ''">
 				AND job_group = #{jobGroup}
@@ -38,7 +38,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 				AND status = #{status}
 			</if>
 			<if test="invokeTarget != null and invokeTarget != ''">
-				AND invoke_target like concat('%', #{invokeTarget}, '%')
+				AND invoke_target like '%' || #{invokeTarget} || '%'
 			</if>
 		</where>
 	</select>

gw-slaj/src/main/resources/mapper/slaj/BisHiddConsultMapper.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?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.goldenwater.slaj.hidd.mapper.BisHiddConsultMapper">
 
@@ -25,7 +25,7 @@
         <include refid="selectBisHiddConsultVo"/>
         <where>
             <if test="hiddGuid != null and hiddGuid != ''">and hidd_guid = #{hiddGuid}</if>
-            <if test="consTheme != null and consTheme != ''">and cons_theme like concat('%', #{consTheme}, '%')</if>
+            <if test="consTheme != null and consTheme != ''">and cons_theme like '%' || #{consTheme} || '%'</if>
             <if test="consTime != null and consTime != ''">and cons_time = #{consTime}</if>
         </where>
         order by create_time desc

gw-slaj/src/main/resources/mapper/slaj/acci/BisAcciAssessMapper.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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.goldenwater.slaj.acci.mapper.BisAcciAssessMapper">
     <resultMap type="com.goldenwater.slaj.acci.domain.BisAcciAssess" id="BisAcciAssessResult">
@@ -30,7 +30,7 @@
         <include refid="selectBisAcciAssessVo"/>
         <where>
             <if test="orgGuid != null and orgGuid != ''">AND org_guid = #{orgGuid}</if>
-            <if test="orgName != null and orgName != ''">AND org_name like concat('%', #{orgName}, '%')</if>
+            <if test="orgName != null and orgName != ''">AND org_name like '%' || #{orgName} || '%'</if>
             <if test="orgCode != null and orgCode != ''">AND org_code = #{orgCode}</if>
             <if test="assessYear != null">AND assess_year = #{assessYear}</if>
             <if test="assessDateNum != null">AND assess_date_num = #{assessDateNum}</if>

gw-slaj/src/main/resources/mapper/slaj/acci/BisAcciAssessRecMapper.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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.goldenwater.slaj.acci.mapper.BisAcciAssessRecMapper">
     <resultMap type="com.goldenwater.slaj.acci.domain.BisAcciAssessRec" id="BisAcciAssessRecResult">
@@ -30,7 +30,7 @@
         <where>
             <if test="assessId != null">AND assess_id = #{assessId}</if>
             <if test="orgGuid != null and orgGuid != ''">AND org_guid = #{orgGuid}</if>
-            <if test="orgName != null and orgName != ''">AND org_name like concat('%', #{orgName}, '%')</if>
+            <if test="orgName != null and orgName != ''">AND org_name like '%' || #{orgName} || '%'</if>
             <if test="orgCode != null and orgCode != ''">AND org_code = #{orgCode}</if>
         </where>
     </select>

gw-slaj/src/main/resources/mapper/slaj/acci/MwrAcciMapper.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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.goldenwater.slaj.acci.mapper.MwrAcciMapper">
     <resultMap type="com.goldenwater.slaj.acci.domain.MwrAcci" id="MwrAcciResult">
@@ -32,7 +32,7 @@
         <include refid="selectMwrAcciVo"/>
         <where>
             <if test="guid != null and guid != ''">AND guid = #{guid}</if>
-            <if test="acciOccuWiun != null and acciOccuWiun != ''">AND acci_occu_wiun like concat('%', #{acciOccuWiun}, '%')</if>
+            <if test="acciOccuWiun != null and acciOccuWiun != ''">AND acci_occu_wiun like '%' || #{acciOccuWiun} || '%'</if>
             <if test="socCreCode != null and socCreCode != ''">AND soc_cre_code = #{socCreCode}</if>
             <if test="acciCate != null and acciCate != ''">AND acci_cate = #{acciCate}</if>
             <if test="wiunProp != null and wiunProp != ''">AND wiun_prop = #{wiunProp}</if>

gw-slaj/src/main/resources/mapper/slaj/acci/MwrCredAcciMapper.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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.goldenwater.slaj.acci.mapper.MwrCredAcciMapper">
     <resultMap type="com.goldenwater.slaj.acci.domain.MwrCredAcci" id="MwrCredAcciResult">
@@ -32,9 +32,9 @@
         <include refid="selectMwrCredAcciVo"/>
         <where>
             <if test="guid != null and guid != ''">AND guid = #{guid}</if>
-            <if test="acciOccuWiun != null and acciOccuWiun != ''">AND acci_occu_wiun like concat('%', #{acciOccuWiun}, '%')</if>
+            <if test="acciOccuWiun != null and acciOccuWiun != ''">AND acci_occu_wiun like '%' || #{acciOccuWiun} || '%'</if>
             <if test="socCreCode != null and socCreCode != ''">AND soc_cre_code = #{socCreCode}</if>
-            <if test="acciOccuLoc != null and acciOccuLoc != ''">AND acci_occu_loc like concat('%', #{acciOccuLoc}, '%')</if>
+            <if test="acciOccuLoc != null and acciOccuLoc != ''">AND acci_occu_loc like '%' || #{acciOccuLoc} || '%'</if>
             <if test="acciOccuTime != null and acciOccuTime != ''">AND acci_occu_time = #{acciOccuTime}</if>
             <if test="acciCate != null and acciCate != ''">AND acci_cate = #{acciCate}</if>
             <if test="wiunProp != null and wiunProp != ''">AND wiun_prop = #{wiunProp}</if>

gw-slaj/src/main/resources/mapper/slaj/acci/ObjAcciMapper.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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.goldenwater.slaj.acci.mapper.ObjAcciMapper">
     <resultMap type="com.goldenwater.slaj.acci.domain.ObjAcci" id="ObjAcciResult">
@@ -54,12 +54,12 @@
             <if test="acciWiunType != null and acciWiunType != ''">AND acci_wiun_type = #{acciWiunType}</if>
             <if test="acciCate != null and acciCate != ''">AND acci_cate = #{acciCate}</if>
             <if test="occuTime != null and occuTime != ''">AND occu_time = #{occuTime}</if>
-            <if test="occuLoc != null and occuLoc != ''">AND occu_loc like concat('%', #{occuLoc}, '%')</if>
+            <if test="occuLoc != null and occuLoc != ''">AND occu_loc like '%' || #{occuLoc} || '%'</if>
             <if test="missNum != null and missNum != ''">AND miss_num = #{missNum}</if>
             <if test="serInjNum != null and serInjNum != ''">AND ser_inj_num = #{serInjNum}</if>
             <if test="casNum != null and casNum != ''">AND cas_num = #{casNum}</if>
             <if test="repStat != null and repStat != ''">AND rep_stat = #{repStat}</if>
-            <if test="sgdwName != null and sgdwName != ''">AND sgdw_name like concat('%', #{sgdwName}, '%')</if>
+            <if test="sgdwName != null and sgdwName != ''">AND sgdw_name like '%' || #{sgdwName} || '%'</if>
             <if test="acciGrad != null and acciGrad != ''">AND acci_grad = #{acciGrad}</if>
             <if test="engGuid != null and engGuid != ''">AND eng_guid = #{engGuid}</if>
             <if test="recPers != null and recPers != ''">AND rec_pers = #{recPers}</if>

gw-slaj/src/main/resources/mapper/slaj/acci/SawfAcciMapper.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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.goldenwater.slaj.acci.mapper.SawfAcciMapper">
     <resultMap type="com.goldenwater.slaj.acci.domain.SawfAcci" id="SawfAcciResult">
@@ -34,7 +34,7 @@
         <include refid="selectSawfAcciVo"/>
         <where>
             <if test="guid != null and guid != ''">AND guid = #{guid}</if>
-            <if test="acciOccuWiun != null and acciOccuWiun != ''">AND acci_occu_wiun like concat('%', #{acciOccuWiun}, '%')</if>
+            <if test="acciOccuWiun != null and acciOccuWiun != ''">AND acci_occu_wiun like '%' || #{acciOccuWiun} || '%'</if>
             <if test="clasCode != null and clasCode != ''">AND clas_code = #{clasCode}</if>
             <if test="socCreCode != null and socCreCode != ''">AND soc_cre_code = #{socCreCode}</if>
             <if test="acciCate != null and acciCate != ''">AND acci_cate = #{acciCate}</if>

gw-slaj/src/main/resources/mapper/slaj/acci/SawfSafeSupeMapper.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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.goldenwater.slaj.acci.mapper.SawfSafeSupeMapper">
     <resultMap type="com.goldenwater.slaj.acci.domain.SawfSafeSupe" id="SawfSafeSupeResult">
@@ -32,9 +32,9 @@
         <where>
             <if test="guid != null and guid != ''">AND guid = #{guid}</if>
             <if test="socCreCode != null and socCreCode != ''">AND soc_cre_code = #{socCreCode}</if>
-            <if test="enteName != null and enteName != ''">AND ente_name like concat('%', #{enteName}, '%')</if>
+            <if test="enteName != null and enteName != ''">AND ente_name like '%' || #{enteName} || '%'</if>
             <if test="enteType != null and enteType != ''">AND ente_type = #{enteType}</if>
-            <if test="legPers != null and legPers != ''">AND leg_pers like concat('%', #{legPers}, '%')</if>
+            <if test="legPers != null and legPers != ''">AND leg_pers like '%' || #{legPers} || '%'</if>
         </where>
     </select>
     <insert id="insertSawfSafeSupe" parameterType="com.goldenwater.slaj.acci.domain.SawfSafeSupe">

gw-slaj/src/main/resources/mapper/slaj/eutr/BisEutrCourCateMapper.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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.goldenwater.slaj.eutr.mapper.BisEutrCourCateMapper">
     <resultMap type="com.goldenwater.slaj.eutr.domain.BisEutrCourCate" id="BisEutrCourCateResult">
@@ -21,7 +21,7 @@
     <select id="selectBisEutrCourCateList" parameterType="com.goldenwater.slaj.eutr.domain.BisEutrCourCate" resultMap="BisEutrCourCateResult">
         <include refid="selectBisEutrCourCateVo"/>
         <where>
-            <if test="eutrCateName != null and eutrCateName != ''">AND eutr_cate_name like concat('%', #{eutrCateName}, '%')</if>
+            <if test="eutrCateName != null and eutrCateName != ''">AND eutr_cate_name like '%' || #{eutrCateName} || '%'</if>
         </where>
     </select>
     <insert id="insertBisEutrCourCate" parameterType="com.goldenwater.slaj.eutr.domain.BisEutrCourCate">

gw-slaj/src/main/resources/mapper/slaj/eutr/BisEutrEqMapper.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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.goldenwater.slaj.eutr.mapper.BisEutrEqMapper">
     <resultMap type="com.goldenwater.slaj.eutr.domain.BisEutrEq" id="BisEutrEqResult">
@@ -28,7 +28,7 @@
     <select id="selectBisEutrEqList" parameterType="com.goldenwater.slaj.eutr.domain.BisEutrEq" resultMap="BisEutrEqResult">
         <include refid="selectBisEutrEqVo"/>
         <where>
-            <if test="eutrEqName != null and eutrEqName != ''">AND eutr_eq_name like concat('%', #{eutrEqName}, '%')</if>
+            <if test="eutrEqName != null and eutrEqName != ''">AND eutr_eq_name like '%' || #{eutrEqName} || '%'</if>
             <if test="examType != null and examType != ''">AND exam_type = #{examType}</if>
             <if test="examDiffType != null and examDiffType != ''">AND exam_diff_type = #{examDiffType}</if>
             <if test="isUse != null and isUse != ''">AND is_use = #{isUse}</if>

gw-slaj/src/main/resources/mapper/slaj/eutr/BisEutrExamMapper.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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.goldenwater.slaj.eutr.mapper.BisEutrExamMapper">
     <resultMap type="com.goldenwater.slaj.eutr.domain.BisEutrExam" id="BisEutrExamResult">
@@ -29,7 +29,7 @@
     <select id="selectBisEutrExamList" parameterType="com.goldenwater.slaj.eutr.domain.BisEutrExam" resultMap="BisEutrExamResult">
         <include refid="selectBisEutrExamVo"/>
         <where>
-            <if test="eutrExamName != null and eutrExamName != ''">AND eutr_exam_name like concat('%', #{eutrExamName}, '%')</if>
+            <if test="eutrExamName != null and eutrExamName != ''">AND eutr_exam_name like '%' || #{eutrExamName} || '%'</if>
             <if test="courGuid != null and courGuid != ''">AND cour_guid = #{courGuid}</if>
         </where>
     </select>

gw-slaj/src/main/resources/mapper/slaj/eutr/BisEutrOfflRecMapper.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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.goldenwater.slaj.eutr.mapper.BisEutrOfflRecMapper">
     <resultMap type="com.goldenwater.slaj.eutr.domain.BisEutrOfflRec" id="BisEutrOfflRecResult">
@@ -30,7 +30,7 @@
     <select id="selectBisEutrOfflRecList" parameterType="com.goldenwater.slaj.eutr.domain.BisEutrOfflRec" resultMap="BisEutrOfflRecResult">
         <include refid="selectBisEutrOfflRecVo"/>
         <where>
-            <if test="eutrThem != null and eutrThem != ''">AND eutr_them like concat('%', #{eutrThem}, '%')</if>
+            <if test="eutrThem != null and eutrThem != ''">AND eutr_them like '%' || #{eutrThem} || '%'</if>
             <if test="eutrType != null and eutrType != ''">AND eutr_type = #{eutrType}</if>
             <if test="orgGuid != null and orgGuid != ''">AND org_guid = #{orgGuid}</if>
         </where>

gw-slaj/src/main/resources/mapper/slaj/eutr/BisEutrPlanMapper.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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.goldenwater.slaj.eutr.mapper.BisEutrPlanMapper">
     <resultMap type="com.goldenwater.slaj.eutr.domain.BisEutrPlan" id="BisEutrPlanResult">
@@ -29,7 +29,7 @@
     <select id="selectBisEutrPlanList" parameterType="com.goldenwater.slaj.eutr.domain.BisEutrPlan" resultMap="BisEutrPlanResult">
         <include refid="selectBisEutrPlanVo"/>
         <where>
-            <if test="eutrPlanTitle != null and eutrPlanTitle != ''">AND eutr_plan_title like concat('%', #{eutrPlanTitle}, '%')</if>
+            <if test="eutrPlanTitle != null and eutrPlanTitle != ''">AND eutr_plan_title like '%' || #{eutrPlanTitle} || '%'</if>
             <if test="repStat != null and repStat != ''">AND rep_stat = #{repStat}</if>
         </where>
     </select>

gw-slaj/src/main/resources/mapper/slaj/eutr/ObjEutrCourMapper.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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.goldenwater.slaj.eutr.mapper.ObjEutrCourMapper">
     <resultMap type="com.goldenwater.slaj.eutr.domain.ObjEutrCour" id="ObjEutrCourResult">
@@ -38,7 +38,7 @@
     <select id="selectObjEutrCourList" parameterType="com.goldenwater.slaj.eutr.domain.ObjEutrCour" resultMap="ObjEutrCourResult">
         <include refid="selectObjEutrCourVo"/>
         <where>
-            <if test="eutrCourName != null and eutrCourName != ''">AND eutr_cour_name like concat('%', #{eutrCourName}, '%')</if>
+            <if test="eutrCourName != null and eutrCourName != ''">AND eutr_cour_name like '%' || #{eutrCourName} || '%'</if>
             <if test="cateGuid != null and cateGuid != ''">AND cate_guid = #{cateGuid}</if>
             <if test="courType != null and courType != ''">AND cour_type = #{courType}</if>
             <if test="veriResu != null and veriResu != ''">AND veri_resu = #{veriResu}</if>

gw-slaj/src/main/resources/mapper/slaj/hazard/MwrHazMapper.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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.goldenwater.slaj.hazard.mapper.MwrHazMapper">
     <resultMap type="com.goldenwater.slaj.hazard.domain.MwrHaz" id="MwrHazResult">
@@ -24,8 +24,8 @@
     <select id="selectMwrHazList" parameterType="com.goldenwater.slaj.hazard.domain.MwrHaz" resultMap="MwrHazResult">
         <include refid="selectMwrHazVo"/>
         <where>
-            <if test="hazName != null and hazName != ''">AND haz_name like concat('%', #{hazName}, '%')</if>
-            <if test="orgName != null and orgName != ''">AND org_name like concat('%', #{orgName}, '%')</if>
+            <if test="hazName != null and hazName != ''">AND haz_name like '%' || #{hazName} || '%'</if>
+            <if test="orgName != null and orgName != ''">AND org_name like '%' || #{orgName} || '%'</if>
             <if test="guid != null and guid != ''">AND guid = #{guid}</if>
         </where>
     </select>

gw-slaj/src/main/resources/mapper/slaj/hazard/ObjEngHazaMapper.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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.goldenwater.slaj.hazard.mapper.ObjEngHazaMapper">
     <resultMap type="com.goldenwater.slaj.hazard.domain.ObjEngHaza" id="ObjEngHazaResult">
@@ -29,7 +29,7 @@
     <select id="selectObjEngHazaList" parameterType="com.goldenwater.slaj.hazard.domain.ObjEngHaza" resultMap="ObjEngHazaResult">
         <include refid="selectObjEngHazaVo"/>
         <where>
-            <if test="hazaEngName != null and hazaEngName != ''">AND haza_eng_name like concat('%', #{hazaEngName}, '%')</if>
+            <if test="hazaEngName != null and hazaEngName != ''">AND haza_eng_name like '%' || #{hazaEngName} || '%'</if>
             <if test="engGuid != null and engGuid != ''">AND eng_guid = #{engGuid}</if>
             <if test="orgGuid != null and orgGuid != ''">AND org_guid = #{orgGuid}</if>
             <if test="guid != null and guid != ''">AND guid = #{guid}</if>

gw-slaj/src/main/resources/mapper/slaj/hazard/ObjHachMapper.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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.goldenwater.slaj.hazard.mapper.ObjHachMapper">
     <resultMap type="com.goldenwater.slaj.hazard.domain.ObjHach" id="ObjHachResult">
@@ -31,9 +31,9 @@
     <select id="selectObjHachList" parameterType="com.goldenwater.slaj.hazard.domain.ObjHach" resultMap="ObjHachResult">
         <include refid="selectObjHachVo"/>
         <where>
-            <if test="hachName != null and hachName != ''">AND hach_name like concat('%', #{hachName}, '%')</if>
+            <if test="hachName != null and hachName != ''">AND hach_name like '%' || #{hachName} || '%'</if>
             <if test="orgGuid != null and orgGuid != ''">AND org_guid = #{orgGuid}</if>
-            <if test="chemName != null and chemName != ''">AND chem_name like concat('%', #{chemName}, '%')</if>
+            <if test="chemName != null and chemName != ''">AND chem_name like '%' || #{chemName} || '%'</if>
             <if test="guid != null and guid != ''">AND guid = #{guid}</if>
         </where>
     </select>

gw-slaj/src/main/resources/mapper/slaj/hazard/ObjHazMapper.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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.goldenwater.slaj.hazard.mapper.ObjHazMapper">
     <resultMap type="com.goldenwater.slaj.hazard.domain.ObjHaz" id="ObjHazResult">
@@ -70,7 +70,7 @@
     <select id="selectObjHazList" parameterType="com.goldenwater.slaj.hazard.domain.ObjHaz" resultMap="ObjHazResult">
         <include refid="selectObjHazVo"/>
         <where>
-            <if test="hazName != null and hazName != ''">AND haz_name like concat('%', #{hazName}, '%')</if>
+            <if test="hazName != null and hazName != ''">AND haz_name like '%' || #{hazName} || '%'</if>
             <if test="orgGuid != null and orgGuid != ''">AND org_guid = #{orgGuid}</if>
             <if test="engGuid != null and engGuid != ''">AND eng_guid = #{engGuid}</if>
             <if test="hiddGrad != null and hiddGrad != ''">AND hidd_grad = #{hiddGrad}</if>

gw-slaj/src/main/resources/mapper/slaj/hazard/ObjHazardMapper.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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.goldenwater.slaj.hazard.mapper.ObjHazardMapper">
     <resultMap type="com.goldenwater.slaj.hazard.domain.ObjHazard" id="ObjHazardResult">
@@ -30,9 +30,9 @@
     <select id="selectObjHazardList" parameterType="com.goldenwater.slaj.hazard.domain.ObjHazard" resultMap="ObjHazardResult">
         <include refid="selectObjHazardVo"/>
         <where>
-            <if test="hazName != null and hazName != ''">AND haz_name like concat('%', #{hazName}, '%')</if>
-            <if test="guideGuid != null and guideGuid != ''">AND guide_guid like concat('%', #{guideGuid}, '%')</if>
-            <if test="partGuid != null and partGuid != ''">AND part_guid like concat('%', #{partGuid}, '%')</if>
+            <if test="hazName != null and hazName != ''">AND haz_name like '%' || #{hazName} || '%'</if>
+            <if test="guideGuid != null and guideGuid != ''">AND guide_guid like '%' || #{guideGuid} || '%'</if>
+            <if test="partGuid != null and partGuid != ''">AND part_guid like '%' || #{partGuid} || '%'</if>
             <if test="orgGuid != null and orgGuid != ''">AND org_guid = #{orgGuid}</if>
             <if test="veriStatus != null and veriStatus != ''">AND veri_status = #{veriStatus}</if>
             <if test="veriPer != null and veriPer != ''">AND veri_per = #{veriPer}</if>

gw-slaj/src/main/resources/mapper/slaj/hazard/TBusiControlMeasureMapper.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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.goldenwater.slaj.hazard.mapper.TBusiControlMeasureMapper">
     <resultMap type="com.goldenwater.slaj.hazard.domain.TBusiControlMeasure" id="TBusiControlMeasureResult">
@@ -26,9 +26,9 @@
     <select id="selectTBusiControlMeasureList" parameterType="com.goldenwater.slaj.hazard.domain.TBusiControlMeasure" resultMap="TBusiControlMeasureResult">
         <include refid="selectTBusiControlMeasureVo"/>
         <where>
-            <if test="hazIdenGuid != null and hazIdenGuid != ''">AND haz_iden_guid like concat('%', #{hazIdenGuid}, '%')</if>
-            <if test="orgPerGuid != null and orgPerGuid != ''">AND org_per_guid like concat('%', #{orgPerGuid}, '%')</if>
-            <if test="consOrgPerGuid != null and consOrgPerGuid != ''">AND cons_org_per_guid like concat('%', #{consOrgPerGuid}, '%')</if>
+            <if test="hazIdenGuid != null and hazIdenGuid != ''">AND haz_iden_guid like '%' || #{hazIdenGuid} || '%'</if>
+            <if test="orgPerGuid != null and orgPerGuid != ''">AND org_per_guid like '%' || #{orgPerGuid} || '%'</if>
+            <if test="consOrgPerGuid != null and consOrgPerGuid != ''">AND cons_org_per_guid like '%' || #{consOrgPerGuid} || '%'</if>
             <if test="supeOrgPerGuid != null and supeOrgPerGuid != ''">AND supe_org_per_guid = #{supeOrgPerGuid}</if>
             <if test="supePerGuid != null and supePerGuid != ''">AND supe_per_guid = #{supePerGuid}</if>
             <if test="scenePerGuid != null and scenePerGuid != ''">AND scene_per_guid = #{scenePerGuid}</if>

gw-slaj/src/main/resources/mapper/slaj/hazard/TBusiControlTermMapper.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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.goldenwater.slaj.hazard.mapper.TBusiControlTermMapper">
     <resultMap type="com.goldenwater.slaj.hazard.domain.TBusiControlTerm" id="TBusiControlTermResult">
@@ -24,9 +24,9 @@
     <select id="selectTBusiControlTermList" parameterType="com.goldenwater.slaj.hazard.domain.TBusiControlTerm" resultMap="TBusiControlTermResult">
         <include refid="selectTBusiControlTermVo"/>
         <where>
-            <if test="hazIdenGuid != null and hazIdenGuid != ''">AND haz_iden_guid like concat('%', #{hazIdenGuid}, '%')</if>
-            <if test="type != null and type != ''">AND type like concat('%', #{type}, '%')</if>
-            <if test="content != null and content != ''">AND content like concat('%', #{content}, '%')</if>
+            <if test="hazIdenGuid != null and hazIdenGuid != ''">AND haz_iden_guid like '%' || #{hazIdenGuid} || '%'</if>
+            <if test="type != null and type != ''">AND type like '%' || #{type} || '%'</if>
+            <if test="content != null and content != ''">AND content like '%' || #{content} || '%'</if>
             <if test="dataType != null and dataType != ''">AND data_type = #{dataType}</if>
             <if test="createPer != null and createPer != ''">AND create_per = #{createPer}</if>
             <if test="createTime != null and createTime != ''">AND create_time = #{createTime}</if>

gw-slaj/src/main/resources/mapper/slaj/hazard/TBusiInspectItemMapper.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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.goldenwater.slaj.hazard.mapper.TBusiInspectItemMapper">
     <resultMap type="com.goldenwater.slaj.hazard.domain.TBusiInspectItem" id="TBusiInspectItemResult">
@@ -25,9 +25,9 @@
     <select id="selectTBusiInspectItemList" parameterType="com.goldenwater.slaj.hazard.domain.TBusiInspectItem" resultMap="TBusiInspectItemResult">
         <include refid="selectTBusiInspectItemVo"/>
         <where>
-            <if test="recordGuid != null and recordGuid != ''">AND record_guid like concat('%', #{recordGuid}, '%')</if>
-            <if test="content != null and content != ''">AND content like concat('%', #{content}, '%')</if>
-            <if test="dataType != null and dataType != ''">AND data_type like concat('%', #{dataType}, '%')</if>
+            <if test="recordGuid != null and recordGuid != ''">AND record_guid like '%' || #{recordGuid} || '%'</if>
+            <if test="content != null and content != ''">AND content like '%' || #{content} || '%'</if>
+            <if test="dataType != null and dataType != ''">AND data_type like '%' || #{dataType} || '%'</if>
             <if test="itemValue != null and itemValue != ''">AND item_value = #{itemValue}</if>
             <if test="result != null and result != ''">AND result = #{result}</if>
             <if test="remark != null and remark != ''">AND remark = #{remark}</if>

gw-slaj/src/main/resources/mapper/slaj/hazard/TBusiInspectRecordMapper.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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.goldenwater.slaj.hazard.mapper.TBusiInspectRecordMapper">
     <resultMap type="com.goldenwater.slaj.hazard.domain.TBusiInspectRecord" id="TBusiInspectRecordResult">
@@ -32,9 +32,9 @@
     <select id="selectTBusiInspectRecordList" parameterType="com.goldenwater.slaj.hazard.domain.TBusiInspectRecord" resultMap="TBusiInspectRecordResult">
         <include refid="selectTBusiInspectRecordVo"/>
         <where>
-            <if test="hazIdenGuid != null and hazIdenGuid != ''">AND haz_iden_guid like concat('%', #{hazIdenGuid}, '%')</if>
-            <if test="taskGuid != null and taskGuid != ''">AND task_guid like concat('%', #{taskGuid}, '%')</if>
-            <if test="startTime != null and startTime != ''">AND start_time like concat('%', #{startTime}, '%')</if>
+            <if test="hazIdenGuid != null and hazIdenGuid != ''">AND haz_iden_guid like '%' || #{hazIdenGuid} || '%'</if>
+            <if test="taskGuid != null and taskGuid != ''">AND task_guid like '%' || #{taskGuid} || '%'</if>
+            <if test="startTime != null and startTime != ''">AND start_time like '%' || #{startTime} || '%'</if>
             <if test="endTime != null and endTime != ''">AND end_time = #{endTime}</if>
             <if test="quantType != null and quantType != ''">AND quant_type = #{quantType}</if>
             <if test="early != null and early != ''">AND early = #{early}</if>

gw-slaj/src/main/resources/mapper/slaj/hazard/TBusiInspectTaskItemMapper.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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.goldenwater.slaj.hazard.mapper.TBusiInspectTaskItemMapper">
     <resultMap type="com.goldenwater.slaj.hazard.domain.TBusiInspectTaskItem" id="TBusiInspectTaskItemResult">
@@ -22,9 +22,9 @@
     <select id="selectTBusiInspectTaskItemList" parameterType="com.goldenwater.slaj.hazard.domain.TBusiInspectTaskItem" resultMap="TBusiInspectTaskItemResult">
         <include refid="selectTBusiInspectTaskItemVo"/>
         <where>
-            <if test="taskGuid != null and taskGuid != ''">AND task_guid like concat('%', #{taskGuid}, '%')</if>
-            <if test="content != null and content != ''">AND content like concat('%', #{content}, '%')</if>
-            <if test="dataType != null and dataType != ''">AND data_type like concat('%', #{dataType}, '%')</if>
+            <if test="taskGuid != null and taskGuid != ''">AND task_guid like '%' || #{taskGuid} || '%'</if>
+            <if test="content != null and content != ''">AND content like '%' || #{content} || '%'</if>
+            <if test="dataType != null and dataType != ''">AND data_type like '%' || #{dataType} || '%'</if>
             <if test="createPer != null and createPer != ''">AND create_per = #{createPer}</if>
             <if test="createTime != null and createTime != ''">AND create_time = #{createTime}</if>
             <if test="updatePer != null and updatePer != ''">AND update_per = #{updatePer}</if>

gw-slaj/src/main/resources/mapper/slaj/hazard/TBusiInspectTaskMapper.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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.goldenwater.slaj.hazard.mapper.TBusiInspectTaskMapper">
     <resultMap type="com.goldenwater.slaj.hazard.domain.TBusiInspectTask" id="TBusiInspectTaskResult">
@@ -27,9 +27,9 @@
     <select id="selectTBusiInspectTaskList" parameterType="com.goldenwater.slaj.hazard.domain.TBusiInspectTask" resultMap="TBusiInspectTaskResult">
         <include refid="selectTBusiInspectTaskVo"/>
         <where>
-            <if test="hazIdenGuid != null and hazIdenGuid != ''">AND haz_iden_guid like concat('%', #{hazIdenGuid}, '%')</if>
-            <if test="startTime != null and startTime != ''">AND start_time like concat('%', #{startTime}, '%')</if>
-            <if test="quantType != null and quantType != ''">AND quant_type like concat('%', #{quantType}, '%')</if>
+            <if test="hazIdenGuid != null and hazIdenGuid != ''">AND haz_iden_guid like '%' || #{hazIdenGuid} || '%'</if>
+            <if test="startTime != null and startTime != ''">AND start_time like '%' || #{startTime} || '%'</if>
+            <if test="quantType != null and quantType != ''">AND quant_type like '%' || #{quantType} || '%'</if>
             <if test="early != null and early != ''">AND early = #{early}</if>
             <if test="threshold != null and threshold != ''">AND threshold = #{threshold}</if>
             <if test="orgGuid != null and orgGuid != ''">AND org_guid = #{orgGuid}</if>

gw-slaj/src/main/resources/mapper/slaj/hazard/TBusiRespPerMapper.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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.goldenwater.slaj.hazard.mapper.TBusiRespPerMapper">
     <resultMap type="com.goldenwater.slaj.hazard.domain.TBusiRespPer" id="TBusiRespPerResult">
@@ -22,9 +22,9 @@
     <select id="selectTBusiRespPerList" parameterType="com.goldenwater.slaj.hazard.domain.TBusiRespPer" resultMap="TBusiRespPerResult">
         <include refid="selectTBusiRespPerVo"/>
         <where>
-            <if test="name != null and name != ''">AND name like concat('%', #{name}, '%')</if>
-            <if test="phone != null and phone != ''">AND phone like concat('%', #{phone}, '%')</if>
-            <if test="createPer != null and createPer != ''">AND create_per like concat('%', #{createPer}, '%')</if>
+            <if test="name != null and name != ''">AND name like '%' || #{name} || '%'</if>
+            <if test="phone != null and phone != ''">AND phone like '%' || #{phone} || '%'</if>
+            <if test="createPer != null and createPer != ''">AND create_per like '%' || #{createPer} || '%'</if>
             <if test="createTime != null and createTime != ''">AND create_time = #{createTime}</if>
             <if test="updatePer != null and updatePer != ''">AND update_per = #{updatePer}</if>
             <if test="updateTime != null and updateTime != ''">AND update_time = #{updateTime}</if>

gw-slaj/src/main/resources/mapper/slaj/hazard/TBusiRiskThresholdMapper.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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.goldenwater.slaj.hazard.mapper.TBusiRiskThresholdMapper">
     <resultMap type="com.goldenwater.slaj.hazard.domain.TBusiRiskThreshold" id="TBusiRiskThresholdResult">
@@ -24,9 +24,9 @@
     <select id="selectTBusiRiskThresholdList" parameterType="com.goldenwater.slaj.hazard.domain.TBusiRiskThreshold" resultMap="TBusiRiskThresholdResult">
         <include refid="selectTBusiRiskThresholdVo"/>
         <where>
-            <if test="note != null and note != ''">AND note like concat('%', #{note}, '%')</if>
-            <if test="collTime != null and collTime != ''">AND coll_time like concat('%', #{collTime}, '%')</if>
-            <if test="updTime != null and updTime != ''">AND upd_time like concat('%', #{updTime}, '%')</if>
+            <if test="note != null and note != ''">AND note like '%' || #{note} || '%'</if>
+            <if test="collTime != null and collTime != ''">AND coll_time like '%' || #{collTime} || '%'</if>
+            <if test="updTime != null and updTime != ''">AND upd_time like '%' || #{updTime} || '%'</if>
             <if test="recPers != null and recPers != ''">AND rec_pers = #{recPers}</if>
             <if test="toDate != null and toDate != ''">AND to_date = #{toDate}</if>
         </where>

gw-slaj/src/main/resources/mapper/slaj/hazard/TDictMajorBuildingMapper.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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.goldenwater.slaj.hazard.mapper.TDictMajorBuildingMapper">
     <resultMap type="com.goldenwater.slaj.hazard.domain.TDictMajorBuilding" id="TDictMajorBuildingResult">
@@ -27,9 +27,9 @@
     <select id="selectTDictMajorBuildingList" parameterType="com.goldenwater.slaj.hazard.domain.TDictMajorBuilding" resultMap="TDictMajorBuildingResult">
         <include refid="selectTDictMajorBuildingVo"/>
         <where>
-            <if test="type != null and type != ''">AND type like concat('%', #{type}, '%')</if>
-            <if test="project != null and project != ''">AND project like concat('%', #{project}, '%')</if>
-            <if test="major != null and major != ''">AND major like concat('%', #{major}, '%')</if>
+            <if test="type != null and type != ''">AND type like '%' || #{type} || '%'</if>
+            <if test="project != null and project != ''">AND project like '%' || #{project} || '%'</if>
+            <if test="major != null and major != ''">AND major like '%' || #{major} || '%'</if>
             <if test="majorName != null and majorName != ''">AND major_name = #{majorName}</if>
             <if test="l != null and l != ''">AND l = #{l}</if>
             <if test="e != null and e != ''">AND e = #{e}</if>

gw-slaj/src/main/resources/mapper/slaj/hazard/TDictMajorCommonMapper.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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.goldenwater.slaj.hazard.mapper.TDictMajorCommonMapper">
     <resultMap type="com.goldenwater.slaj.hazard.domain.TDictMajorCommon" id="TDictMajorCommonResult">
@@ -29,9 +29,9 @@
     <select id="selectTDictMajorCommonList" parameterType="com.goldenwater.slaj.hazard.domain.TDictMajorCommon" resultMap="TDictMajorCommonResult">
         <include refid="selectTDictMajorCommonVo"/>
         <where>
-            <if test="type != null and type != ''">AND type like concat('%', #{type}, '%')</if>
-            <if test="project != null and project != ''">AND project like concat('%', #{project}, '%')</if>
-            <if test="major != null and major != ''">AND major like concat('%', #{major}, '%')</if>
+            <if test="type != null and type != ''">AND type like '%' || #{type} || '%'</if>
+            <if test="project != null and project != ''">AND project like '%' || #{project} || '%'</if>
+            <if test="major != null and major != ''">AND major like '%' || #{major} || '%'</if>
             <if test="reason != null and reason != ''">AND reason = #{reason}</if>
             <if test="aftermath != null and aftermath != ''">AND aftermath = #{aftermath}</if>
             <if test="riskMethod != null and riskMethod != ''">AND risk_method = #{riskMethod}</if>

gw-slaj/src/main/resources/mapper/slaj/hazard/TDictMajorEdMapper.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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.goldenwater.slaj.hazard.mapper.TDictMajorEdMapper">
     <resultMap type="com.goldenwater.slaj.hazard.domain.TDictMajorEd" id="TDictMajorEdResult">
@@ -26,9 +26,9 @@
     <select id="selectTDictMajorEdList" parameterType="com.goldenwater.slaj.hazard.domain.TDictMajorEd" resultMap="TDictMajorEdResult">
         <include refid="selectTDictMajorEdVo"/>
         <where>
-            <if test="majorType != null and majorType != ''">AND major_type like concat('%', #{majorType}, '%')</if>
-            <if test="project != null and project != ''">AND project like concat('%', #{project}, '%')</if>
-            <if test="majorCon != null and majorCon != ''">AND major_con like concat('%', #{majorCon}, '%')</if>
+            <if test="majorType != null and majorType != ''">AND major_type like '%' || #{majorType} || '%'</if>
+            <if test="project != null and project != ''">AND project like '%' || #{project} || '%'</if>
+            <if test="majorCon != null and majorCon != ''">AND major_con like '%' || #{majorCon} || '%'</if>
             <if test="accident != null and accident != ''">AND accident = #{accident}</if>
             <if test="version != null and version != ''">AND version = #{version}</if>
             <if test="incentive != null and incentive != ''">AND incentive = #{incentive}</if>

gw-slaj/src/main/resources/mapper/slaj/hazard/TDictMajorSourceMapper.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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.goldenwater.slaj.hazard.mapper.TDictMajorSourceMapper">
     <resultMap type="com.goldenwater.slaj.hazard.domain.TDictMajorSource" id="TDictMajorSourceResult">
@@ -28,9 +28,9 @@
     <select id="selectTDictMajorSourceList" parameterType="com.goldenwater.slaj.hazard.domain.TDictMajorSource" resultMap="TDictMajorSourceResult">
         <include refid="selectTDictMajorSourceVo"/>
         <where>
-            <if test="majorType != null and majorType != ''">AND major_type like concat('%', #{majorType}, '%')</if>
-            <if test="project != null and project != ''">AND project like concat('%', #{project}, '%')</if>
-            <if test="majorSource != null and majorSource != ''">AND major_source like concat('%', #{majorSource}, '%')</if>
+            <if test="majorType != null and majorType != ''">AND major_type like '%' || #{majorType} || '%'</if>
+            <if test="project != null and project != ''">AND project like '%' || #{project} || '%'</if>
+            <if test="majorSource != null and majorSource != ''">AND major_source like '%' || #{majorSource} || '%'</if>
             <if test="incentive != null and incentive != ''">AND incentive = #{incentive}</if>
             <if test="aftermath != null and aftermath != ''">AND aftermath = #{aftermath}</if>
             <if test="engtype != null and engtype != ''">AND engtype = #{engtype}</if>

gw-slaj/src/main/resources/mapper/slaj/hidd/AttMedBaseMapper.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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.goldenwater.slaj.hidd.mapper.AttMedBaseMapper">
     <resultMap type="com.goldenwater.slaj.hidd.domain.AttMedBase" id="AttMedBaseResult">
@@ -38,10 +38,10 @@
     <select id="selectAttMedBaseList" parameterType="com.goldenwater.slaj.hidd.domain.AttMedBase" resultMap="AttMedBaseResult">
         <include refid="selectAttMedBaseVo"/>
         <where>
-            <if test="medName != null and medName != ''">AND med_name like concat('%', #{medName}, '%')</if>
+            <if test="medName != null and medName != ''">AND med_name like '%' || #{medName} || '%'</if>
             <if test="medType != null and medType != ''">AND med_type = #{medType}</if>
             <if test="medExt != null and medExt != ''">AND med_ext = #{medExt}</if>
-            <if test="keyWord != null and keyWord != ''">AND key_word like concat('%', #{keyWord}, '%')</if>
+            <if test="keyWord != null and keyWord != ''">AND key_word like '%' || #{keyWord} || '%'</if>
         </where>
     </select>
     <insert id="insertAttMedBase" parameterType="com.goldenwater.slaj.hidd.domain.AttMedBase">

gw-slaj/src/main/resources/mapper/slaj/hidd/AttOrgBaseMapper.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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.goldenwater.slaj.hidd.mapper.AttOrgBaseMapper">
     <resultMap type="com.goldenwater.slaj.hidd.domain.AttOrgBase" id="AttOrgBaseResult">
@@ -32,7 +32,7 @@
     <select id="selectAttOrgBaseList" parameterType="com.goldenwater.slaj.hidd.domain.AttOrgBase" resultMap="AttOrgBaseResult">
         <include refid="selectAttOrgBaseVo"/>
         <where>
-            <if test="orgName != null and orgName != ''">AND org_name like concat('%', #{orgName}, '%')</if>
+            <if test="orgName != null and orgName != ''">AND org_name like '%' || #{orgName} || '%'</if>
             <if test="orgCode != null and orgCode != ''">AND org_code = #{orgCode}</if>
             <if test="pguid != null and pguid != ''">AND pguid = #{pguid}</if>
         </where>

gw-slaj/src/main/resources/mapper/slaj/hidd/AttOrgExtMapper.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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.goldenwater.slaj.hidd.mapper.AttOrgExtMapper">
     <resultMap type="com.goldenwater.slaj.hidd.domain.AttOrgExt" id="AttOrgExtResult">
@@ -92,7 +92,7 @@
         <include refid="selectAttOrgExtVo"/>
         <where>
             <if test="orgGuid != null and orgGuid != ''">AND org_guid = #{orgGuid}</if>
-            <if test="wiunName != null and wiunName != ''">AND wiun_name like concat('%', #{wiunName}, '%')</if>
+            <if test="wiunName != null and wiunName != ''">AND wiun_name like '%' || #{wiunName} || '%'</if>
             <if test="wiunCode != null and wiunCode != ''">AND wiun_code = #{wiunCode}</if>
         </where>
     </select>

gw-slaj/src/main/resources/mapper/slaj/hidd/BisOrgMonRepPeriMapper.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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.goldenwater.slaj.hidd.mapper.BisOrgMonRepPeriMapper">
     <resultMap type="com.goldenwater.slaj.hidd.domain.BisOrgMonRepPeri" id="BisOrgMonRepPeriResult">
@@ -29,7 +29,7 @@
     <select id="selectBisOrgMonRepPeriList" parameterType="com.goldenwater.slaj.hidd.domain.BisOrgMonRepPeri" resultMap="BisOrgMonRepPeriResult">
         <include refid="selectBisOrgMonRepPeriVo"/>
         <where>
-            <if test="repName != null and repName != ''">AND rep_name like concat('%', #{repName}, '%')</if>
+            <if test="repName != null and repName != ''">AND rep_name like '%' || #{repName} || '%'</if>
             <if test="repType != null and repType != ''">AND rep_type = #{repType}</if>
             <if test="repOrgGuid != null and repOrgGuid != ''">AND rep_org_guid = #{repOrgGuid}</if>
         </where>

gw-slaj/src/main/resources/mapper/slaj/hidd/BisSinsScheMapper.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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.goldenwater.slaj.hidd.mapper.BisSinsScheMapper">
     <resultMap type="com.goldenwater.slaj.hidd.domain.BisSinsSche" id="BisSinsScheResult">
@@ -30,7 +30,7 @@
         <include refid="selectBisSinsScheVo"/>
         <where>
             <if test="sinsGuid != null and sinsGuid != ''">AND sins_guid = #{sinsGuid}</if>
-            <if test="scheName != null and scheName != ''">AND sche_name like concat('%', #{scheName}, '%')</if>
+            <if test="scheName != null and scheName != ''">AND sche_name like '%' || #{scheName} || '%'</if>
         </where>
     </select>
     <insert id="insertBisSinsSche" parameterType="com.goldenwater.slaj.hidd.domain.BisSinsSche">

gw-slaj/src/main/resources/mapper/slaj/hidd/ObjEngMapper.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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.goldenwater.slaj.hidd.mapper.ObjEngMapper">
     <resultMap type="com.goldenwater.slaj.hidd.domain.ObjEng" id="ObjEngResult">
@@ -26,7 +26,7 @@
     <select id="selectObjEngList" parameterType="com.goldenwater.slaj.hidd.domain.ObjEng" resultMap="ObjEngResult">
         <include refid="selectObjEngVo"/>
         <where>
-            <if test="engName != null and engName != ''">AND eng_name like concat('%', #{engName}, '%')</if>
+            <if test="engName != null and engName != ''">AND eng_name like '%' || #{engName} || '%'</if>
             <if test="engType != null and engType != ''">AND eng_type = #{engType}</if>
         </where>
     </select>

gw-slaj/src/main/resources/mapper/slaj/hidd/ObjHiddMapper.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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.goldenwater.slaj.hidd.mapper.ObjHiddMapper">
     <resultMap type="com.goldenwater.slaj.hidd.domain.ObjHidd" id="ObjHiddResult">
@@ -44,7 +44,7 @@
     <select id="selectObjHiddList" parameterType="com.goldenwater.slaj.hidd.domain.ObjHidd" resultMap="ObjHiddResult">
         <include refid="selectObjHiddVo"/>
         <where>
-            <if test="hiddName != null and hiddName != ''">AND hidd_name like concat('%', #{hiddName}, '%')</if>
+            <if test="hiddName != null and hiddName != ''">AND hidd_name like '%' || #{hiddName} || '%'</if>
             <if test="hiddGrad != null and hiddGrad != ''">AND hidd_grad = #{hiddGrad}</if>
             <if test="hiddStat != null and hiddStat != ''">AND hidd_stat = #{hiddStat}</if>
             <if test="orgGuid != null and orgGuid != ''">AND org_guid = #{orgGuid}</if>
@@ -103,7 +103,7 @@
     <select id="selectObjHiddListByName" parameterType="com.goldenwater.slaj.hidd.domain.ObjHidd" resultMap="ObjHiddResult">
         <include refid="selectObjHiddVo"/>
         <where>
-            <if test="hiddName != null and hiddName != ''">AND hidd_name like concat('%', #{hiddName}, '%')</if>
+            <if test="hiddName != null and hiddName != ''">AND hidd_name like '%' || #{hiddName} || '%'</if>
             <if test="hiddGrad != null and hiddGrad != ''">AND hidd_grad = #{hiddGrad}</if>
             <if test="hiddStat != null and hiddStat != ''">AND hidd_stat = #{hiddStat}</if>
             <if test="orgGuid != null and orgGuid != ''">AND org_guid = #{orgGuid}</if>
@@ -115,7 +115,7 @@
         <include refid="selectObjHiddVo"/>
         <where>
             <if test="orgGuid != null and orgGuid != ''">AND org_guid in (select guid from att_org_base where parent_org_guid = #{orgGuid})</if>
-            <if test="hiddName != null and hiddName != ''">AND hidd_name like concat('%', #{hiddName}, '%')</if>
+            <if test="hiddName != null and hiddName != ''">AND hidd_name like '%' || #{hiddName} || '%'</if>
             <if test="hiddGrad != null and hiddGrad != ''">AND hidd_grad = #{hiddGrad}</if>
             <if test="hiddStat != null and hiddStat != ''">AND hidd_stat = #{hiddStat}</if>
         </where>

gw-slaj/src/main/resources/mapper/slaj/hidd/TDictHiddEngMapper.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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.goldenwater.slaj.hidd.mapper.TDictHiddEngMapper">
     <resultMap type="com.goldenwater.slaj.hidd.domain.TDictHiddEng" id="TDictHiddEngResult">
@@ -23,7 +23,7 @@
         <include refid="selectTDictHiddEngVo"/>
         <where>
             <if test="dictCode != null and dictCode != ''">AND dict_code = #{dictCode}</if>
-            <if test="dictName != null and dictName != ''">AND dict_name like concat('%', #{dictName}, '%')</if>
+            <if test="dictName != null and dictName != ''">AND dict_name like '%' || #{dictName} || '%'</if>
             <if test="status != null and status != ''">AND status = #{status}</if>
         </where>
     </select>

gw-slaj/src/main/resources/mapper/slaj/sins/AttEngResMapper.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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.goldenwater.slaj.sins.mapper.AttEngResMapper">
     <resultMap type="com.goldenwater.slaj.sins.domain.AttEngRes" id="AttEngResResult">
@@ -58,7 +58,7 @@
         <include refid="selectAttEngResVo"/>
         <where>
             <if test="engName != null and engName != ''">
-                and eng_name like concat('%', #{engName}, '%')
+                and eng_name like '%' || #{engName} || '%'
             </if>
             <if test="engGuid != null and engGuid != ''">
                 and eng_guid = #{engGuid}

gw-slaj/src/main/resources/mapper/slaj/sins/BisSinsReportMapper.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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.goldenwater.slaj.sins.mapper.BisSinsReportMapper">
     <resultMap type="com.goldenwater.slaj.sins.domain.BisSinsReport" id="BisSinsReportResult">
@@ -28,7 +28,7 @@
         <include refid="selectBisSinsReportVo"/>
         <where>
             <if test="reportName != null and reportName != ''">
-                and report_name like concat('%', #{reportName}, '%')
+                and report_name like '%' || #{reportName} || '%'
             </if>
             <if test="objsinsguid != null and objsinsguid != ''">
                 and objsinsguid = #{objsinsguid}

gw-slaj/src/main/resources/mapper/slaj/sins/BisSinsScheGropMapper.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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.goldenwater.slaj.sins.mapper.BisSinsScheGropMapper">
     <resultMap type="com.goldenwater.slaj.sins.domain.BisSinsScheGrop" id="BisSinsScheGropResult">
@@ -31,7 +31,7 @@
                 and sche_guid = #{scheGuid}
             </if>
             <if test="groupName != null and groupName != ''">
-                and group_name like concat('%', #{groupName}, '%')
+                and group_name like '%' || #{groupName} || '%'
             </if>
         </where>
     </select>

gw-slaj/src/main/resources/mapper/slaj/sins/ObjCaseMapper.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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.goldenwater.slaj.sins.mapper.ObjCaseMapper">
     <resultMap type="com.goldenwater.slaj.sins.domain.ObjCase" id="ObjCaseResult">
@@ -61,7 +61,7 @@
         <include refid="selectObjCaseVo"/>
         <where>
             <if test="caseName != null and caseName != ''">
-                and case_name like concat('%', #{caseName}, '%')
+                and case_name like '%' || #{caseName} || '%'
             </if>
             <if test="caseNum != null and caseNum != ''">
                 and case_num = #{caseNum}

gw-slaj/src/main/resources/mapper/slaj/sins/ObjExpertMapper.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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.goldenwater.slaj.sins.mapper.ObjExpertMapper">
     <resultMap type="com.goldenwater.slaj.sins.domain.ObjExpert" id="ObjExpertResult">
@@ -48,10 +48,10 @@
         <include refid="selectObjExpertVo"/>
         <where>
             <if test="persName != null and persName != ''">
-                and pers_name like concat('%', #{persName}, '%')
+                and pers_name like '%' || #{persName} || '%'
             </if>
             <if test="major != null and major != ''">
-                and major like concat('%', #{major}, '%')
+                and major like '%' || #{major} || '%'
             </if>
             <if test="expertGrad != null and expertGrad != ''">
                 and expert_grad = #{expertGrad}

gw-slaj/src/main/resources/mapper/slaj/sins/ObjSinsMapper.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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.goldenwater.slaj.sins.mapper.ObjSinsMapper">
     <resultMap type="com.goldenwater.slaj.sins.domain.ObjSins" id="ObjSinsResult">
@@ -31,7 +31,7 @@
         <include refid="selectObjSinsVo"/>
         <where>
             <if test="sinsDeplName != null and sinsDeplName != ''">
-                and sins_depl_name like concat('%', #{sinsDeplName}, '%')
+                and sins_depl_name like '%' || #{sinsDeplName} || '%'
             </if>
             <if test="scheModel != null and scheModel != ''">
                 and sche_model = #{scheModel}

gw-slaj/src/main/resources/mapper/slaj/sins/SawfCredSaprMapper.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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.goldenwater.slaj.sins.mapper.SawfCredSaprMapper">
     <resultMap type="com.goldenwater.slaj.sins.domain.SawfCredSapr" id="SawfCredSaprResult">
@@ -27,7 +27,7 @@
         <include refid="selectSawfCredSaprVo"/>
         <where>
             <if test="unitName != null and unitName != ''">
-                and unit_name like concat('%', #{unitName}, '%')
+                and unit_name like '%' || #{unitName} || '%'
             </if>
             <if test="unitSocCreCode != null and unitSocCreCode != ''">
                 and unit_soc_cre_code = #{unitSocCreCode}

gw-slaj/src/main/resources/mapper/slaj/stan/BisStanScoreMapper.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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.goldenwater.slaj.stan.mapper.BisStanScoreMapper">
     <resultMap type="com.goldenwater.slaj.stan.domain.BisStanScore" id="BisStanScoreResult">
@@ -35,7 +35,7 @@
         <where>
             <if test="pGuid != null and pGuid != ''">and p_guid = #{pGuid}</if>
             <if test="stanReviGuid != null and stanReviGuid != ''">and stan_revi_guid = #{stanReviGuid}</if>
-            <if test="name != null and name != ''">and name like concat('%', #{name}, '%')</if>
+            <if test="name != null and name != ''">and name like '%' || #{name} || '%'</if>
         </where>
     </select>
 

gw-slaj/src/main/resources/mapper/slaj/stan/ObjPunoMapper.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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.goldenwater.slaj.stan.mapper.ObjPunoMapper">
     <resultMap type="com.goldenwater.slaj.stan.domain.ObjPuno" id="ObjPunoResult">
@@ -34,7 +34,7 @@
     <select id="selectObjPunoList" parameterType="com.goldenwater.slaj.stan.domain.ObjPuno" resultMap="ObjPunoResult">
         <include refid="selectObjPunoVo"/>
         <where>
-            <if test="titl != null and titl != ''">and titl like concat('%', #{titl}, '%')</if>
+            <if test="titl != null and titl != ''">and titl like '%' || #{titl} || '%'</if>
             <if test="punoType != null and punoType != ''">and puno_type = #{punoType}</if>
             <if test="stat != null and stat != ''">and stat = #{stat}</if>
         </where>

gw-system/src/main/java/com/goldenwater/system/domain/SysNoticeRead.java

@@ -18,7 +18,7 @@ public class SysNoticeRead
     private Long noticeId;
 
     /** 用户ID */
-    private Long userId;
+    private String userId;
 
     /** 阅读时间 */
     private Date readTime;
@@ -43,12 +43,12 @@ public class SysNoticeRead
         this.noticeId = noticeId;
     }
 
-    public Long getUserId()
+    public String getUserId()
     {
         return userId;
     }
 
-    public void setUserId(Long userId)
+    public void setUserId(String userId)
     {
         this.userId = userId;
     }

gw-system/src/main/java/com/goldenwater/system/domain/SysUserPost.java

@@ -11,17 +11,17 @@ import org.apache.commons.lang3.builder.ToStringStyle;
 public class SysUserPost
 {
     /** 用户ID */
-    private Long userId;
+    private String userId;
     
     /** 岗位ID */
     private Long postId;
 
-    public Long getUserId()
+    public String getUserId()
     {
         return userId;
     }
 
-    public void setUserId(Long userId)
+    public void setUserId(String userId)
     {
         this.userId = userId;
     }

gw-system/src/main/java/com/goldenwater/system/domain/SysUserRole.java

@@ -11,17 +11,17 @@ import org.apache.commons.lang3.builder.ToStringStyle;
 public class SysUserRole
 {
     /** 用户ID */
-    private Long userId;
+    private String userId;
     
     /** 角色ID */
     private Long roleId;
 
-    public Long getUserId()
+    public String getUserId()
     {
         return userId;
     }
 
-    public void setUserId(Long userId)
+    public void setUserId(String userId)
     {
         this.userId = userId;
     }

gw-system/src/main/java/com/goldenwater/system/mapper/SysDeptMapper.java

@@ -6,14 +6,14 @@ import com.goldenwater.common.core.domain.entity.SysDept;
 
 /**
  * 部门管理 数据层
- * 
+ *
  * @author goldenwater
  */
 public interface SysDeptMapper
 {
     /**
      * 查询部门管理数据
-     * 
+     *
      * @param dept 部门信息
      * @return 部门信息集合
      */
@@ -21,7 +21,7 @@ public interface SysDeptMapper
 
     /**
      * 根据角色ID查询部门树信息
-     * 
+     *
      * @param roleId 角色ID
      * @param deptCheckStrictly 部门树选择项是否关联显示
      * @return 选中部门列表
@@ -30,56 +30,56 @@ public interface SysDeptMapper
 
     /**
      * 根据部门ID查询信息
-     * 
+     *
      * @param deptId 部门ID
      * @return 部门信息
      */
-    public SysDept selectDeptById(Long deptId);
+    public SysDept selectDeptById(String deptId);
 
     /**
      * 根据ID查询所有子部门
-     * 
+     *
      * @param deptId 部门ID
      * @return 部门列表
      */
-    public List<SysDept> selectChildrenDeptById(Long deptId);
+    public List<SysDept> selectChildrenDeptById(String deptId);
 
     /**
      * 根据ID查询所有子部门（正常状态）
-     * 
+     *
      * @param deptId 部门ID
      * @return 子部门数
      */
-    public int selectNormalChildrenDeptById(Long deptId);
+    public int selectNormalChildrenDeptById(String deptId);
 
     /**
      * 是否存在子节点
-     * 
+     *
      * @param deptId 部门ID
      * @return 结果
      */
-    public int hasChildByDeptId(Long deptId);
+    public int hasChildByDeptId(String deptId);
 
     /**
      * 查询部门是否存在用户
-     * 
+     *
      * @param deptId 部门ID
      * @return 结果
      */
-    public int checkDeptExistUser(Long deptId);
+    public int checkDeptExistUser(String deptId);
 
     /**
      * 校验部门名称是否唯一
-     * 
+     *
      * @param deptName 部门名称
      * @param parentId 父部门ID
      * @return 结果
      */
-    public SysDept checkDeptNameUnique(@Param("deptName") String deptName, @Param("parentId") Long parentId);
+    public SysDept checkDeptNameUnique(@Param("deptName") String deptName, @Param("parentId") String parentId);
 
     /**
      * 新增部门信息
-     * 
+     *
      * @param dept 部门信息
      * @return 结果
      */
@@ -87,7 +87,7 @@ public interface SysDeptMapper
 
     /**
      * 修改部门信息
-     * 
+     *
      * @param dept 部门信息
      * @return 结果
      */
@@ -95,14 +95,14 @@ public interface SysDeptMapper
 
     /**
      * 修改所在部门正常状态
-     * 
+     *
      * @param deptIds 部门ID组
      */
     public void updateDeptStatusNormal(Long[] deptIds);
 
     /**
      * 修改子元素关系
-     * 
+     *
      * @param depts 子元素
      * @return 结果
      */
@@ -117,9 +117,9 @@ public interface SysDeptMapper
 
     /**
      * 删除部门管理信息
-     * 
+     *
      * @param deptId 部门ID
      * @return 结果
      */
-    public int deleteDeptById(Long deptId);
+    public int deleteDeptById(String deptId);
 }

gw-system/src/main/java/com/goldenwater/system/mapper/SysMenuMapper.java

@@ -48,7 +48,7 @@ public interface SysMenuMapper
      * @param userId 用户ID
      * @return 权限列表
      */
-    public List<String> selectMenuPermsByUserId(Long userId);
+    public List<String> selectMenuPermsByUserId(String userId);
 
     /**
      * 根据用户ID查询菜单
@@ -63,7 +63,7 @@ public interface SysMenuMapper
      * @param userId 用户ID
      * @return 菜单列表
      */
-    public List<SysMenu> selectMenuTreeByUserId(Long userId);
+    public List<SysMenu> selectMenuTreeByUserId(String userId);
 
     /**
      * 根据角色ID查询菜单树信息

gw-system/src/main/java/com/goldenwater/system/mapper/SysNoticeReadMapper.java

@@ -26,7 +26,7 @@ public interface SysNoticeReadMapper
      * @param userId 用户ID
      * @return 未读数量
      */
-    public int selectUnreadCount(@Param("userId") Long userId);
+    public int selectUnreadCount(@Param("userId") String userId);
 
     /**
      * 查询某用户是否已读某公告
@@ -35,7 +35,7 @@ public interface SysNoticeReadMapper
      * @param userId   用户ID
      * @return 已读记录数（0未读 1已读）
      */
-    public int selectIsRead(@Param("noticeId") Long noticeId, @Param("userId") Long userId);
+    public int selectIsRead(@Param("noticeId") Long noticeId, @Param("userId") String userId);
 
     /**
      * 批量标记已读
@@ -44,7 +44,7 @@ public interface SysNoticeReadMapper
      * @param noticeIds 公告ID数组
      * @return 结果
      */
-    public int insertNoticeReadBatch(@Param("userId") Long userId, @Param("noticeIds") Long[] noticeIds);
+    public int insertNoticeReadBatch(@Param("userId") String userId, @Param("noticeIds") Long[] noticeIds);
 
     /**
      * 查询带已读状态的公告列表（SQL层限制条数，一次查询完成）
@@ -53,7 +53,7 @@ public interface SysNoticeReadMapper
      * @param limit  最多返回条数
      * @return 带 isRead 标记的公告列表
      */
-    public List<SysNotice> selectNoticeListWithReadStatus(@Param("userId") Long userId, @Param("limit") int limit);
+    public List<SysNotice> selectNoticeListWithReadStatus(@Param("userId") String userId, @Param("limit") int limit);
 
     /**
      * 公告删除时清理对应已读记录

gw-system/src/main/java/com/goldenwater/system/mapper/SysPostMapper.java

@@ -39,7 +39,7 @@ public interface SysPostMapper
      * @param userId 用户ID
      * @return 选中岗位ID列表
      */
-    public List<Long> selectPostListByUserId(Long userId);
+    public List<String> selectPostListByUserId(String userId);
 
     /**
      * 查询用户所属岗位组

gw-system/src/main/java/com/goldenwater/system/mapper/SysRoleMapper.java

@@ -24,7 +24,7 @@ public interface SysRoleMapper
      * @param userId 用户ID
      * @return 角色列表
      */
-    public List<SysRole> selectRolePermissionByUserId(Long userId);
+    public List<SysRole> selectRolePermissionByUserId(String userId);
 
     /**
      * 查询所有角色
@@ -39,7 +39,7 @@ public interface SysRoleMapper
      * @param userId 用户ID
      * @return 选中角色ID列表
      */
-    public List<Long> selectRoleListByUserId(Long userId);
+    public List<String> selectRoleListByUserId(String userId);
 
     /**
      * 通过角色ID查询角色

gw-system/src/main/java/com/goldenwater/system/mapper/SysUserMapper.java

@@ -50,7 +50,7 @@ public interface SysUserMapper
      * @param userId 用户ID
      * @return 用户对象信息
      */
-    public SysUser selectUserById(Long userId);
+    public SysUser selectUserById(String userId);
 
     /**
      * 新增用户信息
@@ -75,7 +75,7 @@ public interface SysUserMapper
      * @param avatar 头像地址
      * @return 结果
      */
-    public int updateUserAvatar(@Param("userId") Long userId, @Param("avatar") String avatar);
+    public int updateUserAvatar(@Param("userId") String userId, @Param("avatar") String avatar);
 
     /**
      * 修改用户状态
@@ -84,7 +84,7 @@ public interface SysUserMapper
      * @param status 状态
      * @return 结果
      */
-    public int updateUserStatus(@Param("userId") Long userId, @Param("status") String status);
+    public int updateUserStatus(@Param("userId") String userId, @Param("status") String status);
 
     /**
      * 更新用户登录信息（IP和登录时间）
@@ -94,7 +94,7 @@ public interface SysUserMapper
      * @param loginDate 登录时间
      * @return 结果
      */
-    public int updateLoginInfo(@Param("userId") Long userId, @Param("loginIp") String loginIp, @Param("loginDate") Date loginDate);
+    public int updateLoginInfo(@Param("userId") String userId, @Param("loginIp") String loginIp, @Param("loginDate") Date loginDate);
 
     /**
      * 重置用户密码
@@ -103,7 +103,7 @@ public interface SysUserMapper
      * @param password 密码
      * @return 结果
      */
-    public int resetUserPwd(@Param("userId") Long userId, @Param("password") String password);
+    public int resetUserPwd(@Param("userId") String userId, @Param("password") String password);
 
     /**
      * 通过用户ID删除用户
@@ -111,7 +111,7 @@ public interface SysUserMapper
      * @param userId 用户ID
      * @return 结果
      */
-    public int deleteUserById(Long userId);
+    public int deleteUserById(String userId);
 
     /**
      * 批量删除用户信息
@@ -119,7 +119,7 @@ public interface SysUserMapper
      * @param userIds 需要删除的用户ID
      * @return 结果
      */
-    public int deleteUserByIds(Long[] userIds);
+    public int deleteUserByIds(String[] userIds);
 
     /**
      * 校验用户名称是否唯一

gw-system/src/main/java/com/goldenwater/system/mapper/SysUserPostMapper.java

@@ -5,22 +5,22 @@ import com.goldenwater.system.domain.SysUserPost;
 
 /**
  * 用户与岗位关联表 数据层
- * 
+ *
  * @author goldenwater
  */
 public interface SysUserPostMapper
 {
     /**
      * 通过用户ID删除用户和岗位关联
-     * 
+     *
      * @param userId 用户ID
      * @return 结果
      */
-    public int deleteUserPostByUserId(Long userId);
+    public int deleteUserPostByUserId(String userId);
 
     /**
      * 通过岗位ID查询岗位使用数量
-     * 
+     *
      * @param postId 岗位ID
      * @return 结果
      */
@@ -28,15 +28,15 @@ public interface SysUserPostMapper
 
     /**
      * 批量删除用户和岗位关联
-     * 
+     *
      * @param ids 需要删除的数据ID
      * @return 结果
      */
-    public int deleteUserPost(Long[] ids);
+    public int deleteUserPost(String[] ids);
 
     /**
      * 批量新增用户岗位信息
-     * 
+     *
      * @param userPostList 用户岗位列表
      * @return 结果
      */

gw-system/src/main/java/com/goldenwater/system/mapper/SysUserRoleMapper.java

@@ -6,30 +6,30 @@ import com.goldenwater.system.domain.SysUserRole;
 
 /**
  * 用户与角色关联表 数据层
- * 
+ *
  * @author goldenwater
  */
 public interface SysUserRoleMapper
 {
     /**
      * 通过用户ID删除用户和角色关联
-     * 
+     *
      * @param userId 用户ID
      * @return 结果
      */
-    public int deleteUserRoleByUserId(Long userId);
+    public int deleteUserRoleByUserId(String userId);
 
     /**
      * 批量删除用户和角色关联
-     * 
+     *
      * @param ids 需要删除的数据ID
      * @return 结果
      */
-    public int deleteUserRole(Long[] ids);
+    public int deleteUserRole(String[] ids);
 
     /**
      * 通过角色ID查询角色使用数量
-     * 
+     *
      * @param roleId 角色ID
      * @return 结果
      */
@@ -37,7 +37,7 @@ public interface SysUserRoleMapper
 
     /**
      * 批量新增用户角色信息
-     * 
+     *
      * @param userRoleList 用户角色列表
      * @return 结果
      */
@@ -45,7 +45,7 @@ public interface SysUserRoleMapper
 
     /**
      * 删除用户和角色关联信息
-     * 
+     *
      * @param userRole 用户和角色关联信息
      * @return 结果
      */
@@ -53,10 +53,10 @@ public interface SysUserRoleMapper
 
     /**
      * 批量取消授权用户角色
-     * 
+     *
      * @param roleId 角色ID
      * @param userIds 需要删除的用户数据ID
      * @return 结果
      */
-    public int deleteUserRoleInfos(@Param("roleId") Long roleId, @Param("userIds") Long[] userIds);
+    public int deleteUserRoleInfos(@Param("roleId") Long roleId, @Param("userIds") String[] userIds);
 }

gw-system/src/main/java/com/goldenwater/system/service/ISysDeptService.java

@@ -6,14 +6,14 @@ import com.goldenwater.common.core.domain.entity.SysDept;
 
 /**
  * 部门管理 服务层
- * 
+ *
  * @author goldenwater
  */
 public interface ISysDeptService
 {
     /**
      * 查询部门管理数据
-     * 
+     *
      * @param dept 部门信息
      * @return 部门信息集合
      */
@@ -21,7 +21,7 @@ public interface ISysDeptService
 
     /**
      * 查询部门树结构信息
-     * 
+     *
      * @param dept 部门信息
      * @return 部门树信息集合
      */
@@ -29,7 +29,7 @@ public interface ISysDeptService
 
     /**
      * 构建前端所需要树结构
-     * 
+     *
      * @param depts 部门列表
      * @return 树结构列表
      */
@@ -37,7 +37,7 @@ public interface ISysDeptService
 
     /**
      * 构建前端所需要下拉树结构
-     * 
+     *
      * @param depts 部门列表
      * @return 下拉树结构列表
      */
@@ -45,7 +45,7 @@ public interface ISysDeptService
 
     /**
      * 根据角色ID查询部门树信息
-     * 
+     *
      * @param roleId 角色ID
      * @return 选中部门列表
      */
@@ -53,39 +53,39 @@ public interface ISysDeptService
 
     /**
      * 根据部门ID查询信息
-     * 
+     *
      * @param deptId 部门ID
      * @return 部门信息
      */
-    public SysDept selectDeptById(Long deptId);
+    public SysDept selectDeptById(String deptId);
 
     /**
      * 根据ID查询所有子部门（正常状态）
-     * 
+     *
      * @param deptId 部门ID
      * @return 子部门数
      */
-    public int selectNormalChildrenDeptById(Long deptId);
+    public int selectNormalChildrenDeptById(String deptId);
 
     /**
      * 是否存在部门子节点
-     * 
+     *
      * @param deptId 部门ID
      * @return 结果
      */
-    public boolean hasChildByDeptId(Long deptId);
+    public boolean hasChildByDeptId(String deptId);
 
     /**
      * 查询部门是否存在用户
-     * 
+     *
      * @param deptId 部门ID
      * @return 结果 true 存在 false 不存在
      */
-    public boolean checkDeptExistUser(Long deptId);
+    public boolean checkDeptExistUser(String deptId);
 
     /**
      * 校验部门名称是否唯一
-     * 
+     *
      * @param dept 部门信息
      * @return 结果
      */
@@ -93,14 +93,14 @@ public interface ISysDeptService
 
     /**
      * 校验部门是否有数据权限
-     * 
+     *
      * @param deptId 部门id
      */
-    public void checkDeptDataScope(Long deptId);
+    public void checkDeptDataScope(String deptId);
 
     /**
      * 新增保存部门信息
-     * 
+     *
      * @param dept 部门信息
      * @return 结果
      */
@@ -108,7 +108,7 @@ public interface ISysDeptService
 
     /**
      * 修改保存部门信息
-     * 
+     *
      * @param dept 部门信息
      * @return 结果
      */
@@ -124,9 +124,9 @@ public interface ISysDeptService
 
     /**
      * 删除部门管理信息
-     * 
+     *
      * @param deptId 部门ID
      * @return 结果
      */
-    public int deleteDeptById(Long deptId);
+    public int deleteDeptById(String deptId);
 }

gw-system/src/main/java/com/goldenwater/system/service/ISysMenuService.java

@@ -19,7 +19,7 @@ public interface ISysMenuService
      * @param userId 用户ID
      * @return 菜单列表
      */
-    public List<SysMenu> selectMenuList(Long userId);
+    public List<SysMenu> selectMenuList(String userId);
 
     /**
      * 根据用户查询系统菜单列表
@@ -28,7 +28,7 @@ public interface ISysMenuService
      * @param userId 用户ID
      * @return 菜单列表
      */
-    public List<SysMenu> selectMenuList(SysMenu menu, Long userId);
+    public List<SysMenu> selectMenuList(SysMenu menu, String userId);
 
     /**
      * 根据用户ID查询权限
@@ -36,7 +36,7 @@ public interface ISysMenuService
      * @param userId 用户ID
      * @return 权限列表
      */
-    public Set<String> selectMenuPermsByUserId(Long userId);
+    public Set<String> selectMenuPermsByUserId(String userId);
 
     /**
      * 根据角色ID查询权限
@@ -52,7 +52,7 @@ public interface ISysMenuService
      * @param userId 用户ID
      * @return 菜单列表
      */
-    public List<SysMenu> selectMenuTreeByUserId(Long userId);
+    public List<SysMenu> selectMenuTreeByUserId(String userId);
 
     /**
      * 根据角色ID查询菜单树信息

gw-system/src/main/java/com/goldenwater/system/service/ISysNoticeReadService.java

@@ -16,7 +16,7 @@ public interface ISysNoticeReadService
      * @param noticeId 公告ID
      * @param userId   用户ID
      */
-    public void markRead(Long noticeId, Long userId);
+    public void markRead(Long noticeId, String userId);
 
     /**
      * 查询某用户未读公告数量
@@ -24,7 +24,7 @@ public interface ISysNoticeReadService
      * @param userId 用户ID
      * @return 未读数量
      */
-    public int selectUnreadCount(Long userId);
+    public int selectUnreadCount(String userId);
 
     /**
      * 查询公告列表并标记当前用户已读状态（用于首页展示）
@@ -33,7 +33,7 @@ public interface ISysNoticeReadService
      * @param limit  最多返回条数
      * @return 带 isRead 标记的公告列表
      */
-    public List<SysNotice> selectNoticeListWithReadStatus(Long userId, int limit);
+    public List<SysNotice> selectNoticeListWithReadStatus(String userId, int limit);
 
     /**
      * 批量标记已读
@@ -41,7 +41,7 @@ public interface ISysNoticeReadService
      * @param userId    用户ID
      * @param noticeIds 公告ID数组
      */
-    public void markReadBatch(Long userId, Long[] noticeIds);
+    public void markReadBatch(String userId, Long[] noticeIds);
 
     /**
      * 删除公告时清理对应已读记录

gw-system/src/main/java/com/goldenwater/system/service/ISysPostService.java

@@ -39,7 +39,7 @@ public interface ISysPostService
      * @param userId 用户ID
      * @return 选中岗位ID列表
      */
-    public List<Long> selectPostListByUserId(Long userId);
+    public List<String> selectPostListByUserId(String userId);
 
     /**
      * 校验岗位名称

gw-system/src/main/java/com/goldenwater/system/service/ISysRoleService.java

@@ -26,7 +26,7 @@ public interface ISysRoleService
      * @param userId 用户ID
      * @return 角色列表
      */
-    public List<SysRole> selectRolesByUserId(Long userId);
+    public List<SysRole> selectRolesByUserId(String userId);
 
     /**
      * 根据用户ID查询角色权限
@@ -34,7 +34,7 @@ public interface ISysRoleService
      * @param userId 用户ID
      * @return 权限列表
      */
-    public Set<String> selectRolePermissionByUserId(Long userId);
+    public Set<String> selectRolePermissionByUserId(String userId);
 
     /**
      * 查询所有角色
@@ -49,7 +49,7 @@ public interface ISysRoleService
      * @param userId 用户ID
      * @return 选中角色ID列表
      */
-    public List<Long> selectRoleListByUserId(Long userId);
+    public List<String> selectRoleListByUserId(String userId);
 
     /**
      * 通过角色ID查询角色
@@ -160,7 +160,7 @@ public interface ISysRoleService
      * @param userIds 需要取消授权的用户数据ID
      * @return 结果
      */
-    public int deleteAuthUsers(Long roleId, Long[] userIds);
+    public int deleteAuthUsers(Long roleId, String[] userIds);
 
     /**
      * 批量选择授权用户角色
@@ -169,5 +169,5 @@ public interface ISysRoleService
      * @param userIds 需要删除的用户数据ID
      * @return 结果
      */
-    public int insertAuthUsers(Long roleId, Long[] userIds);
+    public int insertAuthUsers(Long roleId, String[] userIds);
 }

gw-system/src/main/java/com/goldenwater/system/service/ISysUserService.java

@@ -49,7 +49,7 @@ public interface ISysUserService
      * @param userId 用户ID
      * @return 用户对象信息
      */
-    public SysUser selectUserById(Long userId);
+    public SysUser selectUserById(String userId);
 
     /**
      * 根据用户ID查询用户所属角色组
@@ -103,7 +103,7 @@ public interface ISysUserService
      * 
      * @param userId 用户id
      */
-    public void checkUserDataScope(Long userId);
+    public void checkUserDataScope(String userId);
 
     /**
      * 新增用户信息
@@ -135,7 +135,7 @@ public interface ISysUserService
      * @param userId 用户ID
      * @param roleIds 角色组
      */
-    public void insertUserAuth(Long userId, Long[] roleIds);
+    public void insertUserAuth(String userId, Long[] roleIds);
 
     /**
      * 修改用户状态
@@ -160,7 +160,7 @@ public interface ISysUserService
      * @param avatar 头像地址
      * @return 结果
      */
-    public boolean updateUserAvatar(Long userId, String avatar);
+    public boolean updateUserAvatar(String userId, String avatar);
 
     /**
      * 更新用户登录信息（IP和登录时间）
@@ -170,7 +170,7 @@ public interface ISysUserService
      * @param loginDate 登录时间
      * @return 结果
      */
-    public void updateLoginInfo(Long userId, String loginIp, Date loginDate);
+    public void updateLoginInfo(String userId, String loginIp, Date loginDate);
 
     /**
      * 重置用户密码
@@ -187,7 +187,7 @@ public interface ISysUserService
      * @param password 密码
      * @return 结果
      */
-    public int resetUserPwd(Long userId, String password);
+    public int resetUserPwd(String userId, String password);
 
     /**
      * 通过用户ID删除用户
@@ -195,7 +195,7 @@ public interface ISysUserService
      * @param userId 用户ID
      * @return 结果
      */
-    public int deleteUserById(Long userId);
+    public int deleteUserById(String userId);
 
     /**
      * 批量删除用户信息
@@ -203,7 +203,7 @@ public interface ISysUserService
      * @param userIds 需要删除的用户ID
      * @return 结果
      */
-    public int deleteUserByIds(Long[] userIds);
+    public int deleteUserByIds(String[] userIds);
 
     /**
      * 导入用户数据

gw-system/src/main/java/com/goldenwater/system/service/impl/SysDeptServiceImpl.java

@@ -23,7 +23,7 @@ import com.goldenwater.system.service.ISysDeptService;
 
 /**
  * 部门管理 服务实现
- * 
+ *
  * @author goldenwater
  */
 @Service
@@ -37,7 +37,7 @@ public class SysDeptServiceImpl implements ISysDeptService
 
     /**
      * 查询部门管理数据
-     * 
+     *
      * @param dept 部门信息
      * @return 部门信息集合
      */
@@ -50,7 +50,7 @@ public class SysDeptServiceImpl implements ISysDeptService
 
     /**
      * 查询部门树结构信息
-     * 
+     *
      * @param dept 部门信息
      * @return 部门树信息集合
      */
@@ -63,7 +63,7 @@ public class SysDeptServiceImpl implements ISysDeptService
 
     /**
      * 构建前端所需要树结构
-     * 
+     *
      * @param depts 部门列表
      * @return 树结构列表
      */
@@ -71,7 +71,7 @@ public class SysDeptServiceImpl implements ISysDeptService
     public List<SysDept> buildDeptTree(List<SysDept> depts)
     {
         List<SysDept> returnList = new ArrayList<SysDept>();
-        List<Long> tempList = depts.stream().map(SysDept::getDeptId).collect(Collectors.toList());
+        List<String> tempList = depts.stream().map(SysDept::getDeptId).toList();
         for (SysDept dept : depts)
         {
             // 如果是顶级节点, 遍历该父节点的所有子节点
@@ -90,7 +90,7 @@ public class SysDeptServiceImpl implements ISysDeptService
 
     /**
      * 构建前端所需要下拉树结构
-     * 
+     *
      * @param depts 部门列表
      * @return 下拉树结构列表
      */
@@ -103,7 +103,7 @@ public class SysDeptServiceImpl implements ISysDeptService
 
     /**
      * 根据角色ID查询部门树信息
-     * 
+     *
      * @param roleId 角色ID
      * @return 选中部门列表
      */
@@ -116,36 +116,36 @@ public class SysDeptServiceImpl implements ISysDeptService
 
     /**
      * 根据部门ID查询信息
-     * 
+     *
      * @param deptId 部门ID
      * @return 部门信息
      */
     @Override
-    public SysDept selectDeptById(Long deptId)
+    public SysDept selectDeptById(String deptId)
     {
         return deptMapper.selectDeptById(deptId);
     }
 
     /**
      * 根据ID查询所有子部门（正常状态）
-     * 
+     *
      * @param deptId 部门ID
      * @return 子部门数
      */
     @Override
-    public int selectNormalChildrenDeptById(Long deptId)
+    public int selectNormalChildrenDeptById(String deptId)
     {
         return deptMapper.selectNormalChildrenDeptById(deptId);
     }
 
     /**
      * 是否存在子节点
-     * 
+     *
      * @param deptId 部门ID
      * @return 结果
      */
     @Override
-    public boolean hasChildByDeptId(Long deptId)
+    public boolean hasChildByDeptId(String deptId)
     {
         int result = deptMapper.hasChildByDeptId(deptId);
         return result > 0;
@@ -153,12 +153,12 @@ public class SysDeptServiceImpl implements ISysDeptService
 
     /**
      * 查询部门是否存在用户
-     * 
+     *
      * @param deptId 部门ID
      * @return 结果 true 存在 false 不存在
      */
     @Override
-    public boolean checkDeptExistUser(Long deptId)
+    public boolean checkDeptExistUser(String deptId)
     {
         int result = deptMapper.checkDeptExistUser(deptId);
         return result > 0;
@@ -166,16 +166,16 @@ public class SysDeptServiceImpl implements ISysDeptService
 
     /**
      * 校验部门名称是否唯一
-     * 
+     *
      * @param dept 部门信息
      * @return 结果
      */
     @Override
     public boolean checkDeptNameUnique(SysDept dept)
     {
-        Long deptId = StringUtils.isNull(dept.getDeptId()) ? -1L : dept.getDeptId();
+        String deptId = StringUtils.isNull(dept.getDeptId()) ? null : dept.getDeptId();
         SysDept info = deptMapper.checkDeptNameUnique(dept.getDeptName(), dept.getParentId());
-        if (StringUtils.isNotNull(info) && info.getDeptId().longValue() != deptId.longValue())
+        if (StringUtils.isNotNull(info) && !info.getDeptId().equals(deptId))
         {
             return UserConstants.NOT_UNIQUE;
         }
@@ -184,11 +184,11 @@ public class SysDeptServiceImpl implements ISysDeptService
 
     /**
      * 校验部门是否有数据权限
-     * 
+     *
      * @param deptId 部门id
      */
     @Override
-    public void checkDeptDataScope(Long deptId)
+    public void checkDeptDataScope(String deptId)
     {
         if (!SecurityUtils.isAdmin() && StringUtils.isNotNull(deptId))
         {
@@ -204,7 +204,7 @@ public class SysDeptServiceImpl implements ISysDeptService
 
     /**
      * 新增保存部门信息
-     * 
+     *
      * @param dept 部门信息
      * @return 结果
      */
@@ -223,7 +223,7 @@ public class SysDeptServiceImpl implements ISysDeptService
 
     /**
      * 修改保存部门信息
-     * 
+     *
      * @param dept 部门信息
      * @return 结果
      */
@@ -251,7 +251,7 @@ public class SysDeptServiceImpl implements ISysDeptService
 
     /**
      * 修改该部门的父级部门状态
-     * 
+     *
      * @param dept 当前部门
      */
     private void updateParentDeptStatusNormal(SysDept dept)
@@ -263,12 +263,12 @@ public class SysDeptServiceImpl implements ISysDeptService
 
     /**
      * 修改子元素关系
-     * 
+     *
      * @param deptId 被修改的部门ID
      * @param newAncestors 新的父ID集合
      * @param oldAncestors 旧的父ID集合
      */
-    public void updateDeptChildren(Long deptId, String newAncestors, String oldAncestors)
+    public void updateDeptChildren(String deptId, String newAncestors, String oldAncestors)
     {
         List<SysDept> children = deptMapper.selectChildrenDeptById(deptId);
         for (SysDept child : children)
@@ -296,7 +296,7 @@ public class SysDeptServiceImpl implements ISysDeptService
             for (int i = 0; i < deptIds.length; i++)
             {
                 SysDept dept = new SysDept();
-                dept.setDeptId(Convert.toLong(deptIds[i]));
+                dept.setDeptId(deptIds[i]);
                 dept.setOrderNum(Convert.toInt(orderNums[i]));
                 deptMapper.updateDeptSort(dept);
             }
@@ -309,12 +309,12 @@ public class SysDeptServiceImpl implements ISysDeptService
 
     /**
      * 删除部门管理信息
-     * 
+     *
      * @param deptId 部门ID
      * @return 结果
      */
     @Override
-    public int deleteDeptById(Long deptId)
+    public int deleteDeptById(String deptId)
     {
         return deptMapper.deleteDeptById(deptId);
     }
@@ -346,7 +346,7 @@ public class SysDeptServiceImpl implements ISysDeptService
         while (it.hasNext())
         {
             SysDept n = (SysDept) it.next();
-            if (StringUtils.isNotNull(n.getParentId()) && n.getParentId().longValue() == t.getDeptId().longValue())
+            if (StringUtils.isNotNull(n.getParentId()) && n.getParentId().equals(t.getDeptId()))
             {
                 tlist.add(n);
             }
@@ -359,6 +359,6 @@ public class SysDeptServiceImpl implements ISysDeptService
      */
     private boolean hasChild(List<SysDept> list, SysDept t)
     {
-        return getChildList(list, t).size() > 0;
+        return !getChildList(list, t).isEmpty();
     }
 }

gw-system/src/main/java/com/goldenwater/system/service/impl/SysMenuServiceImpl.java

@@ -59,7 +59,7 @@ public class SysMenuServiceImpl implements ISysMenuService
      * @return 菜单列表
      */
     @Override
-    public List<SysMenu> selectMenuList(Long userId)
+    public List<SysMenu> selectMenuList(String userId)
     {
         return selectMenuList(new SysMenu(), userId);
     }
@@ -71,7 +71,7 @@ public class SysMenuServiceImpl implements ISysMenuService
      * @return 菜单列表
      */
     @Override
-    public List<SysMenu> selectMenuList(SysMenu menu, Long userId)
+    public List<SysMenu> selectMenuList(SysMenu menu, String userId)
     {
         List<SysMenu> menuList = null;
         // 管理员显示所有菜单信息
@@ -94,7 +94,7 @@ public class SysMenuServiceImpl implements ISysMenuService
      * @return 权限列表
      */
     @Override
-    public Set<String> selectMenuPermsByUserId(Long userId)
+    public Set<String> selectMenuPermsByUserId(String userId)
     {
         List<String> perms = menuMapper.selectMenuPermsByUserId(userId);
         Set<String> permsSet = new HashSet<>();
@@ -136,7 +136,7 @@ public class SysMenuServiceImpl implements ISysMenuService
      * @return 菜单列表
      */
     @Override
-    public List<SysMenu> selectMenuTreeByUserId(Long userId)
+    public List<SysMenu> selectMenuTreeByUserId(String userId)
     {
         List<SysMenu> menus = null;
         if (SecurityUtils.isAdmin(userId))

gw-system/src/main/java/com/goldenwater/system/service/impl/SysNoticeReadServiceImpl.java

@@ -23,7 +23,7 @@ public class SysNoticeReadServiceImpl implements ISysNoticeReadService
      * 标记已读
      */
     @Override
-    public void markRead(Long noticeId, Long userId)
+    public void markRead(Long noticeId, String userId)
     {
         SysNoticeRead record = new SysNoticeRead();
         record.setNoticeId(noticeId);
@@ -35,7 +35,7 @@ public class SysNoticeReadServiceImpl implements ISysNoticeReadService
      * 查询某用户未读公告数量
      */
     @Override
-    public int selectUnreadCount(Long userId)
+    public int selectUnreadCount(String userId)
     {
         return noticeReadMapper.selectUnreadCount(userId);
     }
@@ -44,7 +44,7 @@ public class SysNoticeReadServiceImpl implements ISysNoticeReadService
      * 查询公告列表并标记当前用户已读状态
      */
     @Override
-    public List<SysNotice> selectNoticeListWithReadStatus(Long userId, int limit)
+    public List<SysNotice> selectNoticeListWithReadStatus(String userId, int limit)
     {
         return noticeReadMapper.selectNoticeListWithReadStatus(userId, limit);
     }
@@ -53,7 +53,7 @@ public class SysNoticeReadServiceImpl implements ISysNoticeReadService
      * 批量标记已读
      */
     @Override
-    public void markReadBatch(Long userId, Long[] noticeIds)
+    public void markReadBatch(String userId, Long[] noticeIds)
     {
         if (noticeIds == null || noticeIds.length == 0)
         {

gw-system/src/main/java/com/goldenwater/system/service/impl/SysPostServiceImpl.java

@@ -67,7 +67,7 @@ public class SysPostServiceImpl implements ISysPostService
      * @return 选中岗位ID列表
      */
     @Override
-    public List<Long> selectPostListByUserId(Long userId)
+    public List<String> selectPostListByUserId(String userId)
     {
         return postMapper.selectPostListByUserId(userId);
     }

gw-system/src/main/java/com/goldenwater/system/service/impl/SysRoleServiceImpl.java

@@ -64,7 +64,7 @@ public class SysRoleServiceImpl implements ISysRoleService
      * @return 角色列表
      */
     @Override
-    public List<SysRole> selectRolesByUserId(Long userId)
+    public List<SysRole> selectRolesByUserId(String userId)
     {
         List<SysRole> userRoles = roleMapper.selectRolePermissionByUserId(userId);
         List<SysRole> roles = selectRoleAll();
@@ -89,7 +89,7 @@ public class SysRoleServiceImpl implements ISysRoleService
      * @return 权限列表
      */
     @Override
-    public Set<String> selectRolePermissionByUserId(Long userId)
+    public Set<String> selectRolePermissionByUserId(String userId)
     {
         List<SysRole> perms = roleMapper.selectRolePermissionByUserId(userId);
         Set<String> permsSet = new HashSet<>();
@@ -121,7 +121,7 @@ public class SysRoleServiceImpl implements ISysRoleService
      * @return 选中角色ID列表
      */
     @Override
-    public List<Long> selectRoleListByUserId(Long userId)
+    public List<String> selectRoleListByUserId(String userId)
     {
         return roleMapper.selectRoleListByUserId(userId);
     }
@@ -397,7 +397,7 @@ public class SysRoleServiceImpl implements ISysRoleService
      * @return 结果
      */
     @Override
-    public int deleteAuthUsers(Long roleId, Long[] userIds)
+    public int deleteAuthUsers(Long roleId, String[] userIds)
     {
         return userRoleMapper.deleteUserRoleInfos(roleId, userIds);
     }
@@ -410,11 +410,11 @@ public class SysRoleServiceImpl implements ISysRoleService
      * @return 结果
      */
     @Override
-    public int insertAuthUsers(Long roleId, Long[] userIds)
+    public int insertAuthUsers(Long roleId, String[] userIds)
     {
         // 新增用户与角色管理
         List<SysUserRole> list = new ArrayList<SysUserRole>();
-        for (Long userId : userIds)
+        for (String userId : userIds)
         {
             SysUserRole ur = new SysUserRole();
             ur.setUserId(userId);

gw-system/src/main/java/com/goldenwater/system/service/impl/SysUserServiceImpl.java

@@ -124,7 +124,7 @@ public class SysUserServiceImpl implements ISysUserService
      * @return 用户对象信息
      */
     @Override
-    public SysUser selectUserById(Long userId)
+    public SysUser selectUserById(String userId)
     {
         return userMapper.selectUserById(userId);
     }
@@ -172,9 +172,9 @@ public class SysUserServiceImpl implements ISysUserService
     @Override
     public boolean checkUserNameUnique(SysUser user)
     {
-        Long userId = StringUtils.isNull(user.getUserId()) ? -1L : user.getUserId();
+        String userId = user.getUserId();
         SysUser info = userMapper.checkUserNameUnique(user.getUserName());
-        if (StringUtils.isNotNull(info) && info.getUserId().longValue() != userId.longValue())
+        if (StringUtils.isNotNull(info) && !StringUtils.equals(info.getUserId(), userId))
         {
             return UserConstants.NOT_UNIQUE;
         }
@@ -190,9 +190,9 @@ public class SysUserServiceImpl implements ISysUserService
     @Override
     public boolean checkPhoneUnique(SysUser user)
     {
-        Long userId = StringUtils.isNull(user.getUserId()) ? -1L : user.getUserId();
+        String userId = user.getUserId();
         SysUser info = userMapper.checkPhoneUnique(user.getPhonenumber());
-        if (StringUtils.isNotNull(info) && info.getUserId().longValue() != userId.longValue())
+        if (StringUtils.isNotNull(info) && !StringUtils.equals(info.getUserId(), userId))
         {
             return UserConstants.NOT_UNIQUE;
         }
@@ -208,9 +208,9 @@ public class SysUserServiceImpl implements ISysUserService
     @Override
     public boolean checkEmailUnique(SysUser user)
     {
-        Long userId = StringUtils.isNull(user.getUserId()) ? -1L : user.getUserId();
+        String userId = user.getUserId();
         SysUser info = userMapper.checkEmailUnique(user.getEmail());
-        if (StringUtils.isNotNull(info) && info.getUserId().longValue() != userId.longValue())
+        if (StringUtils.isNotNull(info) && !StringUtils.equals(info.getUserId(), userId))
         {
             return UserConstants.NOT_UNIQUE;
         }
@@ -237,7 +237,7 @@ public class SysUserServiceImpl implements ISysUserService
      * @param userId 用户id
      */
     @Override
-    public void checkUserDataScope(Long userId)
+    public void checkUserDataScope(String userId)
     {
         if (!SecurityUtils.isAdmin())
         {
@@ -292,7 +292,7 @@ public class SysUserServiceImpl implements ISysUserService
     @Transactional
     public int updateUser(SysUser user)
     {
-        Long userId = user.getUserId();
+        String userId = user.getUserId();
         // 删除用户与角色关联
         userRoleMapper.deleteUserRoleByUserId(userId);
         // 新增用户与角色管理
@@ -312,7 +312,7 @@ public class SysUserServiceImpl implements ISysUserService
      */
     @Override
     @Transactional
-    public void insertUserAuth(Long userId, Long[] roleIds)
+    public void insertUserAuth(String userId, Long[] roleIds)
     {
         userRoleMapper.deleteUserRoleByUserId(userId);
         insertUserRole(userId, roleIds);
@@ -350,7 +350,7 @@ public class SysUserServiceImpl implements ISysUserService
      * @return 结果
      */
     @Override
-    public boolean updateUserAvatar(Long userId, String avatar)
+    public boolean updateUserAvatar(String userId, String avatar)
     {
         return userMapper.updateUserAvatar(userId, avatar) > 0;
     }
@@ -363,7 +363,7 @@ public class SysUserServiceImpl implements ISysUserService
      * @param loginDate 登录时间
      * @return 结果
      */
-    public void updateLoginInfo(Long userId, String loginIp, Date loginDate)
+    public void updateLoginInfo(String userId, String loginIp, Date loginDate)
     {
         userMapper.updateLoginInfo(userId, loginIp, loginDate);
     }
@@ -388,7 +388,7 @@ public class SysUserServiceImpl implements ISysUserService
      * @return 结果
      */
     @Override
-    public int resetUserPwd(Long userId, String password)
+    public int resetUserPwd(String userId, String password)
     {
         return userMapper.resetUserPwd(userId, password);
     }
@@ -432,7 +432,7 @@ public class SysUserServiceImpl implements ISysUserService
      * @param userId 用户ID
      * @param roleIds 角色组
      */
-    public void insertUserRole(Long userId, Long[] roleIds)
+    public void insertUserRole(String userId, Long[] roleIds)
     {
         if (StringUtils.isNotEmpty(roleIds))
         {
@@ -457,7 +457,7 @@ public class SysUserServiceImpl implements ISysUserService
      */
     @Override
     @Transactional
-    public int deleteUserById(Long userId)
+    public int deleteUserById(String userId)
     {
         // 删除用户与角色关联
         userRoleMapper.deleteUserRoleByUserId(userId);
@@ -474,9 +474,9 @@ public class SysUserServiceImpl implements ISysUserService
      */
     @Override
     @Transactional
-    public int deleteUserByIds(Long[] userIds)
+    public int deleteUserByIds(String[] userIds)
     {
-        for (Long userId : userIds)
+        for (String userId : userIds)
         {
             checkUserAllowed(new SysUser(userId));
             checkUserDataScope(userId);

gw-system/src/main/resources/mapper/system/SysConfigMapper.xml

@@ -42,13 +42,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectConfigVo"/>
         <where>
 			<if test="configName != null and configName != ''">
-				AND config_name like concat('%', #{configName}, '%')
+				AND config_name like '%' || #{configName} || '%'
 			</if>
 			<if test="configType != null and configType != ''">
 				AND config_type = #{configType}
 			</if>
 			<if test="configKey != null and configKey != ''">
-				AND config_key like concat('%', #{configKey}, '%')
+				AND config_key like '%' || #{configKey} || '%'
 			</if>
 			<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
 				and date_format(create_time,'%Y%m%d') &gt;= date_format(#{params.beginTime},'%Y%m%d')

gw-system/src/main/resources/mapper/system/SysDeptMapper.xml

@@ -37,7 +37,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			AND parent_id = #{parentId}
 		</if>
 		<if test="deptName != null and deptName != ''">
-			AND dept_name like concat('%', #{deptName}, '%')
+			AND dept_name like '%' || #{deptName} || '%'
 		</if>
 		<if test="status != null and status != ''">
 			AND status = #{status}

gw-system/src/main/resources/mapper/system/SysDictDataMapper.xml

@@ -32,7 +32,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 				AND dict_type = #{dictType}
 			</if>
 			<if test="dictLabel != null and dictLabel != ''">
-				AND dict_label like concat('%', #{dictLabel}, '%')
+				AND dict_label like '%' || #{dictLabel} || '%'
 			</if>
 			<if test="status != null and status != ''">
 				AND status = #{status}

gw-system/src/main/resources/mapper/system/SysDictTypeMapper.xml

@@ -24,13 +24,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	    <include refid="selectDictTypeVo"/>
 		<where>
 		    <if test="dictName != null and dictName != ''">
-				AND dict_name like concat('%', #{dictName}, '%')
+				AND dict_name like '%' || #{dictName} || '%'
 			</if>
 			<if test="status != null and status != ''">
 				AND status = #{status}
 			</if>
 			<if test="dictType != null and dictType != ''">
-				AND dict_type like concat('%', #{dictType}, '%')
+				AND dict_type like '%' || #{dictType} || '%'
 			</if>
 			<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
 				and date_format(create_time,'%Y%m%d') &gt;= date_format(#{params.beginTime},'%Y%m%d')

gw-system/src/main/resources/mapper/system/SysLogininforMapper.xml

@@ -25,13 +25,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		select info_id, user_name, ipaddr, login_location, browser, os, status, msg, login_time from sys_logininfor
 		<where>
 			<if test="ipaddr != null and ipaddr != ''">
-				AND ipaddr like concat('%', #{ipaddr}, '%')
+				AND ipaddr like '%' || #{ipaddr} || '%'
 			</if>
 			<if test="status != null and status != ''">
 				AND status = #{status}
 			</if>
 			<if test="userName != null and userName != ''">
-				AND user_name like concat('%', #{userName}, '%')
+				AND user_name like '%' || #{userName} || '%'
 			</if>
 			<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
 				AND login_time &gt;= #{params.beginTime}

gw-system/src/main/resources/mapper/system/SysMenuMapper.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?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">
@@ -37,7 +37,7 @@
 		<include refid="selectMenuVo"/>
 		<where>
 			<if test="menuName != null and menuName != ''">
-				AND menu_name like concat('%', #{menuName}, '%')
+				AND menu_name like '%' || #{menuName} || '%'
 			</if>
 			<if test="visible != null and visible != ''">
 				AND visible = #{visible}
@@ -63,7 +63,7 @@
 		left join sys_role ro on ur.role_id = ro.role_id
 		where ur.user_id = #{params.userId}
 		<if test="menuName != null and menuName != ''">
-            AND m.menu_name like concat('%', #{menuName}, '%')
+            AND m.menu_name like '%' || #{menuName} || '%'
 		</if>
 		<if test="visible != null and visible != ''">
             AND m.visible = #{visible}
@@ -74,7 +74,7 @@
 		order by m.parent_id, m.order_num
 	</select>
 
-    <select id="selectMenuTreeByUserId" parameterType="Long" resultMap="SysMenuResult">
+    <select id="selectMenuTreeByUserId" parameterType="String" resultMap="SysMenuResult">
 		select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.query, m.route_name, m.visible, m.status, coalesce(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time
 		from sys_menu m
 			 left join sys_role_menu rm on m.menu_id = rm.menu_id
@@ -103,7 +103,7 @@
 			 left join sys_user_role ur on rm.role_id = ur.role_id
 	</select>
 
-	<select id="selectMenuPermsByUserId" parameterType="Long" resultType="String">
+	<select id="selectMenuPermsByUserId" parameterType="String" resultType="String">
 		select distinct m.perms
 		from sys_menu m
 			 left join sys_role_menu rm on m.menu_id = rm.menu_id

gw-system/src/main/resources/mapper/system/SysNoticeMapper.xml

@@ -31,13 +31,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectNoticeVo"/>
         <where>
 			<if test="noticeTitle != null and noticeTitle != ''">
-				AND notice_title like concat('%', #{noticeTitle}, '%')
+				AND notice_title like '%' || #{noticeTitle} || '%'
 			</if>
 			<if test="noticeType != null and noticeType != ''">
 				AND notice_type = #{noticeType}
 			</if>
 			<if test="createBy != null and createBy != ''">
-				AND create_by like concat('%', #{createBy}, '%')
+				AND create_by like '%' || #{createBy} || '%'
 			</if>
 		</where>
 		order by notice_id desc

gw-system/src/main/resources/mapper/system/SysOperLogMapper.xml

@@ -38,10 +38,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<include refid="selectOperLogVo"/>
 		<where>
 			<if test="operIp != null and operIp != ''">
-				AND oper_ip like concat('%', #{operIp}, '%')
+				AND oper_ip like '%' || #{operIp} || '%'
 			</if>
 			<if test="title != null and title != ''">
-				AND title like concat('%', #{title}, '%')
+				AND title like '%' || #{title} || '%'
 			</if>
 			<if test="businessType != null">
 				AND business_type = #{businessType}
@@ -56,7 +56,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 				AND status = #{status}
 			</if>
 			<if test="operName != null and operName != ''">
-				AND oper_name like concat('%', #{operName}, '%')
+				AND oper_name like '%' || #{operName} || '%'
 			</if>
 			<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
 				AND oper_time &gt;= #{params.beginTime}

gw-system/src/main/resources/mapper/system/SysPostMapper.xml

@@ -26,13 +26,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	    <include refid="selectPostVo"/>
 		<where>
 			<if test="postCode != null and postCode != ''">
-				AND post_code like concat('%', #{postCode}, '%')
+				AND post_code like '%' || #{postCode} || '%'
 			</if>
 			<if test="status != null and status != ''">
 				AND status = #{status}
 			</if>
 			<if test="postName != null and postName != ''">
-				AND post_name like concat('%', #{postName}, '%')
+				AND post_name like '%' || #{postName} || '%'
 			</if>
 		</where>
 	</select>
@@ -46,7 +46,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		where post_id = #{postId}
 	</select>
 	
-	<select id="selectPostListByUserId" parameterType="Long" resultType="Long">
+	<select id="selectPostListByUserId" parameterType="String" resultType="String">
 		select p.post_id
         from sys_post p
 	        left join sys_user_post up on up.post_id = p.post_id

gw-system/src/main/resources/mapper/system/SysRoleMapper.xml

@@ -37,13 +37,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			AND r.role_id = #{roleId}
 		</if>
 		<if test="roleName != null and roleName != ''">
-			AND r.role_name like concat('%', #{roleName}, '%')
+			AND r.role_name like '%' || #{roleName} || '%'
 		</if>
 		<if test="status != null and status != ''">
 			AND r.status = #{status}
 		</if>
 		<if test="roleKey != null and roleKey != ''">
-			AND r.role_key like concat('%', #{roleKey}, '%')
+			AND r.role_key like '%' || #{roleKey} || '%'
 		</if>
 		<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
 			and date_format(r.create_time,'%Y%m%d') &gt;= date_format(#{params.beginTime},'%Y%m%d')
@@ -56,7 +56,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		order by r.role_sort
 	</select>
     
-	<select id="selectRolePermissionByUserId" parameterType="Long" resultMap="SysRoleResult">
+	<select id="selectRolePermissionByUserId" parameterType="String" resultMap="SysRoleResult">
 		<include refid="selectRoleVo"/>
 		WHERE r.del_flag = '0' and ur.user_id = #{userId}
 	</select>
@@ -65,7 +65,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<include refid="selectRoleVo"/>
 	</select>
 	
-	<select id="selectRoleListByUserId" parameterType="Long" resultType="Long">
+	<select id="selectRoleListByUserId" parameterType="String" resultType="String">
 		select r.role_id
         from sys_role r
 	        left join sys_user_role ur on ur.role_id = r.role_id

gw-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -8,7 +8,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <id     property="userId"        column="user_id"         />
         <result property="deptId"        column="dept_id"         />
         <result property="userName"      column="user_name"       />
-        <result property="nickName"      column="nick_name"       />
+        <result property="realName"      column="real_name"       />
         <result property="email"         column="email"           />
         <result property="phonenumber"   column="phonenumber"     />
         <result property="sex"           column="sex"             />
@@ -27,7 +27,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <association property="dept"     javaType="SysDept"         resultMap="deptResult" />
         <collection  property="roles"    javaType="java.util.List"  resultMap="RoleResult" />
     </resultMap>
-	
+
     <resultMap id="deptResult" type="SysDept">
         <id     property="deptId"    column="dept_id"     />
         <result property="parentId"  column="parent_id"   />
@@ -37,7 +37,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="leader"    column="leader"      />
         <result property="status"    column="dept_status" />
     </resultMap>
-	
+
     <resultMap id="RoleResult" type="SysRole">
         <id     property="roleId"       column="role_id"        />
         <result property="roleName"     column="role_name"      />
@@ -46,9 +46,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="dataScope"    column="data_scope"     />
         <result property="status"       column="role_status"    />
     </resultMap>
-	
+
 	<sql id="selectUserVo">
-        select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.pwd_update_date, u.create_by, u.create_time, u.remark, 
+        select u.user_id, u.dept_id, u.user_name, u.real_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.pwd_update_date, u.create_by, u.create_time, u.remark,
         d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.status as dept_status,
         r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status
         from sys_user u
@@ -56,22 +56,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		    left join sys_user_role ur on u.user_id = ur.user_id
 		    left join sys_role r on r.role_id = ur.role_id
     </sql>
-    
+
     <select id="selectUserList" parameterType="SysUser" resultMap="SysUserResult">
-		select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader from sys_user u
+		select u.user_id, u.dept_id, u.real_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader from sys_user u
 		left join sys_dept d on u.dept_id = d.dept_id
 		where u.del_flag = '0'
-		<if test="userId != null and userId != 0">
+		<if test="userId != null and userId != ''">
 			AND u.user_id = #{userId}
 		</if>
 		<if test="userName != null and userName != ''">
-			AND u.user_name like concat('%', #{userName}, '%')
+			AND u.user_name like '%' || #{userName} || '%'
 		</if>
 		<if test="status != null and status != ''">
 			AND u.status = #{status}
 		</if>
 		<if test="phonenumber != null and phonenumber != ''">
-			AND u.phonenumber like concat('%', #{phonenumber}, '%')
+			AND u.phonenumber like '%' || #{phonenumber} || '%'
 		</if>
 		<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
 			AND date_format(u.create_time,'%Y%m%d') &gt;= date_format(#{params.beginTime},'%Y%m%d')
@@ -85,26 +85,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<!-- 数据范围过滤 -->
 		${params.dataScope}
 	</select>
-	
+
 	<select id="selectAllocatedList" parameterType="SysUser" resultMap="SysUserResult">
-	    select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time
+	    select distinct u.user_id, u.dept_id, u.user_name, u.real_name, u.email, u.phonenumber, u.status, u.create_time
 	    from sys_user u
 			 left join sys_dept d on u.dept_id = d.dept_id
 			 left join sys_user_role ur on u.user_id = ur.user_id
 			 left join sys_role r on r.role_id = ur.role_id
 	    where u.del_flag = '0' and r.role_id = #{roleId}
 	    <if test="userName != null and userName != ''">
-			AND u.user_name like concat('%', #{userName}, '%')
+			AND u.user_name like '%' || #{userName} || '%'
 		</if>
 		<if test="phonenumber != null and phonenumber != ''">
-			AND u.phonenumber like concat('%', #{phonenumber}, '%')
+			AND u.phonenumber like '%' || #{phonenumber} || '%'
 		</if>
 		<!-- 数据范围过滤 -->
 		${params.dataScope}
 	</select>
-	
+
 	<select id="selectUnallocatedList" parameterType="SysUser" resultMap="SysUserResult">
-	    select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time
+	    select distinct u.user_id, u.dept_id, u.user_name, u.real_name, u.email, u.phonenumber, u.status, u.create_time
 	    from sys_user u
 			 left join sys_dept d on u.dept_id = d.dept_id
 			 left join sys_user_role ur on u.user_id = ur.user_id
@@ -112,43 +112,43 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	    where u.del_flag = '0' and (r.role_id != #{roleId} or r.role_id IS NULL)
 	    and u.user_id not in (select u.user_id from sys_user u inner join sys_user_role ur on u.user_id = ur.user_id and ur.role_id = #{roleId})
 	    <if test="userName != null and userName != ''">
-			AND u.user_name like concat('%', #{userName}, '%')
+			AND u.user_name like '%' || #{userName} || '%'
 		</if>
 		<if test="phonenumber != null and phonenumber != ''">
-			AND u.phonenumber like concat('%', #{phonenumber}, '%')
+			AND u.phonenumber like '%' || #{phonenumber} || '%'
 		</if>
 		<!-- 数据范围过滤 -->
 		${params.dataScope}
 	</select>
-	
+
 	<select id="selectUserByUserName" parameterType="String" resultMap="SysUserResult">
 	    <include refid="selectUserVo"/>
 		where u.user_name = #{userName} and u.del_flag = '0'
 	</select>
-	
-	<select id="selectUserById" parameterType="Long" resultMap="SysUserResult">
+
+	<select id="selectUserById" parameterType="String" resultMap="SysUserResult">
 		<include refid="selectUserVo"/>
 		where u.user_id = #{userId}
 	</select>
-	
+
 	<select id="checkUserNameUnique" parameterType="String" resultMap="SysUserResult">
 		select user_id, user_name from sys_user where user_name = #{userName} and del_flag = '0' limit 1
 	</select>
-	
+
 	<select id="checkPhoneUnique" parameterType="String" resultMap="SysUserResult">
 		select user_id, phonenumber from sys_user where phonenumber = #{phonenumber} and del_flag = '0' limit 1
 	</select>
-	
+
 	<select id="checkEmailUnique" parameterType="String" resultMap="SysUserResult">
 		select user_id, email from sys_user where email = #{email} and del_flag = '0' limit 1
 	</select>
-	
+
 	<insert id="insertUser" parameterType="SysUser" useGeneratedKeys="true" keyProperty="userId">
  		insert into sys_user(
- 			<if test="userId != null and userId != 0">user_id,</if>
+ 			<if test="userId != null and userId != ''">user_id,</if>
  			<if test="deptId != null and deptId != 0">dept_id,</if>
  			<if test="userName != null and userName != ''">user_name,</if>
- 			<if test="nickName != null and nickName != ''">nick_name,</if>
+ 			<if test="realName != null and realName != ''">real_name,</if>
  			<if test="email != null and email != ''">email,</if>
  			<if test="avatar != null and avatar != ''">avatar,</if>
  			<if test="phonenumber != null and phonenumber != ''">phonenumber,</if>
@@ -163,7 +163,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="userId != null and userId != ''">#{userId},</if>
  			<if test="deptId != null and deptId != ''">#{deptId},</if>
  			<if test="userName != null and userName != ''">#{userName},</if>
- 			<if test="nickName != null and nickName != ''">#{nickName},</if>
+ 			<if test="realName != null and realName != ''">#{realName},</if>
  			<if test="email != null and email != ''">#{email},</if>
  			<if test="avatar != null and avatar != ''">#{avatar},</if>
  			<if test="phonenumber != null and phonenumber != ''">#{phonenumber},</if>
@@ -176,12 +176,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			now()
  		)
 	</insert>
-	
+
 	<update id="updateUser" parameterType="SysUser">
  		update sys_user
  		<set>
  			<if test="deptId != 0">dept_id = #{deptId},</if>
- 			<if test="nickName != null and nickName != ''">nick_name = #{nickName},</if>
+ 			<if test="realName != null and realName != ''">real_name = #{realName},</if>
  			<if test="email != null ">email = #{email},</if>
  			<if test="phonenumber != null ">phonenumber = #{phonenumber},</if>
  			<if test="sex != null and sex != ''">sex = #{sex},</if>
@@ -196,32 +196,32 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  		</set>
  		where user_id = #{userId}
 	</update>
-	
+
 	<update id="updateUserStatus" parameterType="SysUser">
  		update sys_user set status = #{status}, update_time = now() where user_id = #{userId}
 	</update>
-	
+
 	<update id="updateUserAvatar" parameterType="SysUser">
  		update sys_user set avatar = #{avatar}, update_time = now() where user_id = #{userId}
 	</update>
-	
+
   	<update id="updateLoginInfo" parameterType="SysUser">
  		update sys_user set login_ip = #{loginIp}, login_date = #{loginDate} where user_id = #{userId}
 	</update>
-	
+
 	<update id="resetUserPwd" parameterType="SysUser">
  		update sys_user set pwd_update_date = now(), password = #{password}, update_time = now() where user_id = #{userId}
 	</update>
-	
-	<delete id="deleteUserById" parameterType="Long">
+
+	<delete id="deleteUserById" parameterType="String">
  		update sys_user set del_flag = '2' where user_id = #{userId}
  	</delete>
- 	
- 	<delete id="deleteUserByIds" parameterType="Long">
+
+ 	<delete id="deleteUserByIds" parameterType="String">
  		update sys_user set del_flag = '2' where user_id in
  		<foreach collection="array" item="userId" open="(" separator="," close=")">
  			#{userId}
-        </foreach> 
+        </foreach>
  	</delete>
-	
-</mapper> 
+
+</mapper>

gw-system/src/main/resources/mapper/system/SysUserPostMapper.xml

@@ -9,7 +9,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<result property="postId"     column="post_id"      />
 	</resultMap>
 
-	<delete id="deleteUserPostByUserId" parameterType="Long">
+	<delete id="deleteUserPostByUserId" parameterType="String">
 		delete from sys_user_post where user_id=#{userId}
 	</delete>
 	
@@ -17,7 +17,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	    select count(1) from sys_user_post where post_id=#{postId}  
 	</select>
 	
-	<delete id="deleteUserPost" parameterType="Long">
+	<delete id="deleteUserPost" parameterType="String">
  		delete from sys_user_post where user_id in
  		<foreach collection="array" item="userId" open="(" separator="," close=")">
  			#{userId}

gw-system/src/main/resources/mapper/system/SysUserRoleMapper.xml

@@ -9,7 +9,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<result property="roleId"     column="role_id"      />
 	</resultMap>
 
-	<delete id="deleteUserRoleByUserId" parameterType="Long">
+	<delete id="deleteUserRoleByUserId" parameterType="String">
 		delete from sys_user_role where user_id=#{userId}
 	</delete>
 	
@@ -17,7 +17,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	    select count(1) from sys_user_role where role_id=#{roleId}  
 	</select>
 	
-	<delete id="deleteUserRole" parameterType="Long">
+	<delete id="deleteUserRole" parameterType="String">
  		delete from sys_user_role where user_id in
  		<foreach collection="array" item="userId" open="(" separator="," close=")">
  			#{userId}