Skip to content

S
smart_gov_platform
Commit 28fd9ccd authored by 赵啸非's avatar 赵啸非
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents 032aa26b 8a2e7cd7
Hide whitespace changes
Inline Side-by-side
Showing with 1604 additions and 1329 deletions
base-manager/src/main/java/com/mortals/xhx/module/workman/model/WorkmanEntity.java
View file @ 28fd9ccd
...@@ -2,6 +2,9 @@ package com.mortals.xhx.module.workman.model; ...@@ -2,6 +2,9 @@ package com.mortals.xhx.module.workman.model;
import com.alibaba.fastjson.annotation.JSONField; import com.alibaba.fastjson.annotation.JSONField;
import com.mortals.xhx.module.workman.model.vo.WorkmanVo; import com.mortals.xhx.module.workman.model.vo.WorkmanVo;
import java.util.Date;
/** /**
* 工作人员实体对象 * 工作人员实体对象
* *
...@@ -105,6 +108,14 @@ public class WorkmanEntity extends WorkmanVo { ...@@ -105,6 +108,14 @@ public class WorkmanEntity extends WorkmanVo {
*/ */
@JSONField(serialize = false) @JSONField(serialize = false)
private String loginPwd; private String loginPwd;
/**
* 最后一次登录时间
*/
private Date lastLoginTime;
/**
* 最后一次登录地址
*/
private String lastLoginAddress;
public WorkmanEntity(){} public WorkmanEntity(){}
...@@ -431,7 +442,34 @@ public class WorkmanEntity extends WorkmanVo { ...@@ -431,7 +442,34 @@ public class WorkmanEntity extends WorkmanVo {
this.loginPwd = loginPwd; this.loginPwd = loginPwd;
} }
/**
* 获取 最后一次登录时间
* @return Date
*/
public Date getLastLoginTime(){
return lastLoginTime;
}
/**
* 设置 最后一次登录时间
* @param lastLoginTime
*/
public void setLastLoginTime(Date lastLoginTime){
this.lastLoginTime = lastLoginTime;
}
/**
* 获取 最后一次登录地址
* @return String
*/
public String getLastLoginAddress(){
return lastLoginAddress;
}
/**
* 设置 最后一次登录地址
* @param lastLoginAddress
*/
public void setLastLoginAddress(String lastLoginAddress){
this.lastLoginAddress = lastLoginAddress;
}
@Override @Override
...@@ -475,6 +513,8 @@ public class WorkmanEntity extends WorkmanVo { ...@@ -475,6 +513,8 @@ public class WorkmanEntity extends WorkmanVo {
sb.append(",online:").append(getOnline()); sb.append(",online:").append(getOnline());
sb.append(",loginName:").append(getLoginName()); sb.append(",loginName:").append(getLoginName());
sb.append(",loginPwd:").append(getLoginPwd()); sb.append(",loginPwd:").append(getLoginPwd());
sb.append(",lastLoginTime:").append(getLastLoginTime());
sb.append(",lastLoginAddress:").append(getLastLoginAddress());
return sb.toString(); return sb.toString();
} }
...@@ -525,5 +565,9 @@ public class WorkmanEntity extends WorkmanVo { ...@@ -525,5 +565,9 @@ public class WorkmanEntity extends WorkmanVo {
this.loginName = ""; this.loginName = "";
this.loginPwd = ""; this.loginPwd = "";
this.lastLoginTime = null;
this.lastLoginAddress = "";
} }
} }
\ No newline at end of file
base-manager/src/main/java/com/mortals/xhx/module/workman/model/WorkmanQuery.java
View file @ 28fd9ccd
...@@ -177,6 +177,15 @@ public class WorkmanQuery extends WorkmanEntity { ...@@ -177,6 +177,15 @@ public class WorkmanQuery extends WorkmanEntity {
/** 密码 */ /** 密码 */
private List<String> loginPwdList; private List<String> loginPwdList;
/** 开始 最后一次登录时间 */
private String lastLoginTimeStart;
/** 结束 最后一次登录时间 */
private String lastLoginTimeEnd;
/** 最后一次登录地址 */
private List<String> lastLoginAddressList;
/** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */ /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
private List<WorkmanQuery> orConditionList; private List<WorkmanQuery> orConditionList;
...@@ -1065,6 +1074,55 @@ public class WorkmanQuery extends WorkmanEntity { ...@@ -1065,6 +1074,55 @@ public class WorkmanQuery extends WorkmanEntity {
public void setLoginPwdList(List<String> loginPwdList){ public void setLoginPwdList(List<String> loginPwdList){
this.loginPwdList = loginPwdList; this.loginPwdList = loginPwdList;
} }
/**
* 获取 开始 最后一次登录时间
* @return lastLoginTimeStart
*/
public String getLastLoginTimeStart(){
return this.lastLoginTimeStart;
}
/**
* 设置 开始 最后一次登录时间
* @param lastLoginTimeStart
*/
public void setLastLoginTimeStart(String lastLoginTimeStart){
this.lastLoginTimeStart = lastLoginTimeStart;
}
/**
* 获取 结束 最后一次登录时间
* @return lastLoginTimeEnd
*/
public String getLastLoginTimeEnd(){
return this.lastLoginTimeEnd;
}
/**
* 设置 结束 最后一次登录时间
* @param lastLoginTimeEnd
*/
public void setLastLoginTimeEnd(String lastLoginTimeEnd){
this.lastLoginTimeEnd = lastLoginTimeEnd;
}
/**
* 获取 最后一次登录地址
* @return lastLoginAddressList
*/
public List<String> getLastLoginAddressList(){
return this.lastLoginAddressList;
}
/**
* 设置 最后一次登录地址
* @param lastLoginAddressList
*/
public void setLastLoginAddressList(List<String> lastLoginAddressList){
this.lastLoginAddressList = lastLoginAddressList;
}
/** /**
* 设置 序号，主键，自增长 * 设置 序号，主键，自增长
* @param id * @param id
......
base-manager/src/main/java/com/mortals/xhx/module/workman/service/WorkmanService.java
View file @ 28fd9ccd
...@@ -20,10 +20,11 @@ public interface WorkmanService extends ICRUDCacheService<WorkmanEntity,Long> { ...@@ -20,10 +20,11 @@ public interface WorkmanService extends ICRUDCacheService<WorkmanEntity,Long> {
* *
* @param loginName 登录用户名 * @param loginName 登录用户名
* @param password 登录密码 * @param password 登录密码
* @param ip ip地址
* @return * @return
* @throws AppException * @throws AppException
*/ */
WorkmanEntity doLogin(String loginName, String password) throws AppException; WorkmanEntity doLogin(String loginName, String password,String ip) throws AppException;
......
base-manager/src/main/java/com/mortals/xhx/module/workman/service/impl/WorkmanServiceImpl.java
View file @ 28fd9ccd
...@@ -88,7 +88,7 @@ public class WorkmanServiceImpl extends AbstractCRUDCacheServiceImpl<WorkmanDao, ...@@ -88,7 +88,7 @@ public class WorkmanServiceImpl extends AbstractCRUDCacheServiceImpl<WorkmanDao,
@Override @Override
public WorkmanEntity doLogin(String loginName, String password) throws AppException { public WorkmanEntity doLogin(String loginName, String password,String loginIp) throws AppException {
WorkmanEntity workmanEntity = this.selectOne(new WorkmanQuery().loginName(loginName)); WorkmanEntity workmanEntity = this.selectOne(new WorkmanQuery().loginName(loginName));
if (workmanEntity == null || !workmanEntity.getLoginName().equals(loginName)) { if (workmanEntity == null || !workmanEntity.getLoginName().equals(loginName)) {
throw new AppException("用户名不存在！"); throw new AppException("用户名不存在！");
...@@ -100,7 +100,11 @@ public class WorkmanServiceImpl extends AbstractCRUDCacheServiceImpl<WorkmanDao, ...@@ -100,7 +100,11 @@ public class WorkmanServiceImpl extends AbstractCRUDCacheServiceImpl<WorkmanDao,
} catch (Exception e) { } catch (Exception e) {
throw new AppException("密码验认出错！", e); throw new AppException("密码验认出错！", e);
} }
WorkmanEntity update = new WorkmanEntity();
update.setId(workmanEntity.getId());
update.setLastLoginAddress(loginIp);
update.setLastLoginTime(new Date());
this.dao.update(update);
return workmanEntity; return workmanEntity;
} }
......
base-manager/src/main/java/com/mortals/xhx/module/workman/web/WorkmanController.java
View file @ 28fd9ccd
...@@ -63,7 +63,8 @@ public class WorkmanController extends BaseCRUDJsonBodyMappingController<Workman ...@@ -63,7 +63,8 @@ public class WorkmanController extends BaseCRUDJsonBodyMappingController<Workman
public String doLogin(@RequestBody WorkmanEntity query) { public String doLogin(@RequestBody WorkmanEntity query) {
JSONObject ret = new JSONObject(); JSONObject ret = new JSONObject();
try { try {
WorkmanEntity workmanEntity = this.service.doLogin(query.getLoginName(), query.getLoginPwd()); String ip = super.getRequestIP(request);
WorkmanEntity workmanEntity = this.service.doLogin(query.getLoginName(), query.getLoginPwd(),ip);
ret.put(KEY_RESULT_CODE, VALUE_RESULT_SUCCESS); ret.put(KEY_RESULT_CODE, VALUE_RESULT_SUCCESS);
ret.put(KEY_RESULT_MSG, "工作人员登录成功！"); ret.put(KEY_RESULT_MSG, "工作人员登录成功！");
ret.put(KEY_RESULT_DATA, workmanEntity); ret.put(KEY_RESULT_DATA, workmanEntity);
......
base-manager/src/main/resources/sqlmap/module/workman/WorkmanMapper.xml
View file @ 28fd9ccd
...@@ -6,6 +6,8 @@ ...@@ -6,6 +6,8 @@
<!-- 字段和属性映射 --> <!-- 字段和属性映射 -->
<resultMap type="WorkmanEntity" id="WorkmanEntity-Map"> <resultMap type="WorkmanEntity" id="WorkmanEntity-Map">
<id property="id" column="id" /> <id property="id" column="id" />
<result property="loginName" column="loginName" />
<result property="loginPwd" column="loginPwd" />
<result property="deptId" column="deptId" /> <result property="deptId" column="deptId" />
<result property="deptName" column="deptName" /> <result property="deptName" column="deptName" />
<result property="windowId" column="windowId" /> <result property="windowId" column="windowId" />
...@@ -30,8 +32,8 @@ ...@@ -30,8 +32,8 @@
<result property="createTime" column="createTime" /> <result property="createTime" column="createTime" />
<result property="createUserId" column="createUserId" /> <result property="createUserId" column="createUserId" />
<result property="updateTime" column="updateTime" /> <result property="updateTime" column="updateTime" />
<result property="loginName" column="loginName" /> <result property="lastLoginTime" column="lastLoginTime" />
<result property="loginPwd" column="loginPwd" /> <result property="lastLoginAddress" column="lastLoginAddress" />
</resultMap> </resultMap>
...@@ -42,6 +44,12 @@ ...@@ -42,6 +44,12 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('id') or colPickMode == 1 and data.containsKey('id')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('id') or colPickMode == 1 and data.containsKey('id')))">
a.id, a.id,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('loginName') or colPickMode == 1 and data.containsKey('loginName')))">
a.loginName,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('loginPwd') or colPickMode == 1 and data.containsKey('loginPwd')))">
a.loginPwd,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deptId') or colPickMode == 1 and data.containsKey('deptId')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deptId') or colPickMode == 1 and data.containsKey('deptId')))">
a.deptId, a.deptId,
</if> </if>
...@@ -114,29 +122,29 @@ ...@@ -114,29 +122,29 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))">
a.updateTime, a.updateTime,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('loginName') or colPickMode == 1 and data.containsKey('loginName')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('lastLoginTime') or colPickMode == 1 and data.containsKey('lastLoginTime')))">
a.loginName, a.lastLoginTime,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('loginPwd') or colPickMode == 1 and data.containsKey('loginPwd')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('lastLoginAddress') or colPickMode == 1 and data.containsKey('lastLoginAddress')))">
a.loginPwd, a.lastLoginAddress,
</if> </if>
</trim> </trim>
</sql> </sql>
<!-- 新增 区分主键自增加还是业务插入 --> <!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="WorkmanEntity" useGeneratedKeys="true" keyProperty="id"> <insert id="insert" parameterType="WorkmanEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_sys_workman insert into mortals_sys_workman
(deptId,deptName,windowId,windowName,siteId,siteName,name,number,userpost,posttitle,politicalstatus,dangyuan,phone,mobile,starlevel,summary,photoPath,duty,promise,business,online,createTime,createUserId,updateTime,loginName,loginPwd) (loginName,loginPwd,deptId,deptName,windowId,windowName,siteId,siteName,name,number,userpost,posttitle,politicalstatus,dangyuan,phone,mobile,starlevel,summary,photoPath,duty,promise,business,online,createTime,createUserId,updateTime,lastLoginTime,lastLoginAddress)
VALUES VALUES
(#{deptId},#{deptName},#{windowId},#{windowName},#{siteId},#{siteName},#{name},#{number},#{userpost},#{posttitle},#{politicalstatus},#{dangyuan},#{phone},#{mobile},#{starlevel},#{summary},#{photoPath},#{duty},#{promise},#{business},#{online},#{createTime},#{createUserId},#{updateTime},#{loginName},#{loginPwd}) (#{loginName},#{loginPwd},#{deptId},#{deptName},#{windowId},#{windowName},#{siteId},#{siteName},#{name},#{number},#{userpost},#{posttitle},#{politicalstatus},#{dangyuan},#{phone},#{mobile},#{starlevel},#{summary},#{photoPath},#{duty},#{promise},#{business},#{online},#{createTime},#{createUserId},#{updateTime},#{lastLoginTime},#{lastLoginAddress})
</insert> </insert>
<!-- 批量新增 --> <!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto"> <insert id="insertBatch" parameterType="paramDto">
insert into mortals_sys_workman insert into mortals_sys_workman
(deptId,deptName,windowId,windowName,siteId,siteName,name,number,userpost,posttitle,politicalstatus,dangyuan,phone,mobile,starlevel,summary,photoPath,duty,promise,business,online,createTime,createUserId,updateTime,loginName,loginPwd) (loginName,loginPwd,deptId,deptName,windowId,windowName,siteId,siteName,name,number,userpost,posttitle,politicalstatus,dangyuan,phone,mobile,starlevel,summary,photoPath,duty,promise,business,online,createTime,createUserId,updateTime,lastLoginTime,lastLoginAddress)
VALUES VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," > <foreach collection="data.dataList" item="item" index="index" separator="," >
(#{item.deptId},#{item.deptName},#{item.windowId},#{item.windowName},#{item.siteId},#{item.siteName},#{item.name},#{item.number},#{item.userpost},#{item.posttitle},#{item.politicalstatus},#{item.dangyuan},#{item.phone},#{item.mobile},#{item.starlevel},#{item.summary},#{item.photoPath},#{item.duty},#{item.promise},#{item.business},#{item.online},#{item.createTime},#{item.createUserId},#{item.updateTime},#{item.loginName},#{item.loginPwd}) (#{item.loginName},#{item.loginPwd},#{item.deptId},#{item.deptName},#{item.windowId},#{item.windowName},#{item.siteId},#{item.siteName},#{item.name},#{item.number},#{item.userpost},#{item.posttitle},#{item.politicalstatus},#{item.dangyuan},#{item.phone},#{item.mobile},#{item.starlevel},#{item.summary},#{item.photoPath},#{item.duty},#{item.promise},#{item.business},#{item.online},#{item.createTime},#{item.createUserId},#{item.updateTime},#{item.lastLoginTime},#{item.lastLoginAddress})
</foreach> </foreach>
</insert> </insert>
...@@ -146,6 +154,12 @@ ...@@ -146,6 +154,12 @@
update mortals_sys_workman as a update mortals_sys_workman as a
set set
<trim suffixOverrides="," suffix=""> <trim suffixOverrides="," suffix="">
<if test="(colPickMode==0 and data.containsKey('loginName')) or (colPickMode==1 and !data.containsKey('loginName'))">
a.loginName=#{data.loginName},
</if>
<if test="(colPickMode==0 and data.containsKey('loginPwd')) or (colPickMode==1 and !data.containsKey('loginPwd'))">
a.loginPwd=#{data.loginPwd},
</if>
<if test="(colPickMode==0 and data.containsKey('deptId')) or (colPickMode==1 and !data.containsKey('deptId'))"> <if test="(colPickMode==0 and data.containsKey('deptId')) or (colPickMode==1 and !data.containsKey('deptId'))">
a.deptId=#{data.deptId}, a.deptId=#{data.deptId},
</if> </if>
...@@ -242,11 +256,11 @@ ...@@ -242,11 +256,11 @@
<if test="(colPickMode==0 and data.containsKey('updateTime')) or (colPickMode==1 and !data.containsKey('updateTime'))"> <if test="(colPickMode==0 and data.containsKey('updateTime')) or (colPickMode==1 and !data.containsKey('updateTime'))">
a.updateTime=#{data.updateTime}, a.updateTime=#{data.updateTime},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('loginName')) or (colPickMode==1 and !data.containsKey('loginName'))"> <if test="(colPickMode==0 and data.containsKey('lastLoginTime')) or (colPickMode==1 and !data.containsKey('lastLoginTime'))">
a.loginName=#{data.loginName}, a.lastLoginTime=#{data.lastLoginTime},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('loginPwd')) or (colPickMode==1 and !data.containsKey('loginPwd'))"> <if test="(colPickMode==0 and data.containsKey('lastLoginAddress')) or (colPickMode==1 and !data.containsKey('lastLoginAddress'))">
a.loginPwd=#{data.loginPwd}, a.lastLoginAddress=#{data.lastLoginAddress},
</if> </if>
</trim> </trim>
<trim suffixOverrides="where" suffix=""> <trim suffixOverrides="where" suffix="">
...@@ -260,6 +274,20 @@ ...@@ -260,6 +274,20 @@
<update id="updateBatch" parameterType="paramDto"> <update id="updateBatch" parameterType="paramDto">
update mortals_sys_workman as a update mortals_sys_workman as a
<trim prefix="set" suffixOverrides=","> <trim prefix="set" suffixOverrides=",">
<trim prefix="loginName=(case" suffix="ELSE loginName end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('loginName')) or (colPickMode==1 and !item.containsKey('loginName'))">
when a.id=#{item.id} then #{item.loginName}
</if>
</foreach>
</trim>
<trim prefix="loginPwd=(case" suffix="ELSE loginPwd end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('loginPwd')) or (colPickMode==1 and !item.containsKey('loginPwd'))">
when a.id=#{item.id} then #{item.loginPwd}
</if>
</foreach>
</trim>
<trim prefix="deptId=(case" suffix="ELSE deptId end),"> <trim prefix="deptId=(case" suffix="ELSE deptId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<choose> <choose>
...@@ -468,17 +496,17 @@ ...@@ -468,17 +496,17 @@
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="loginName=(case" suffix="ELSE loginName end),"> <trim prefix="lastLoginTime=(case" suffix="ELSE lastLoginTime end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('loginName')) or (colPickMode==1 and !item.containsKey('loginName'))"> <if test="(colPickMode==0 and item.containsKey('lastLoginTime')) or (colPickMode==1 and !item.containsKey('lastLoginTime'))">
when a.id=#{item.id} then #{item.loginName} when a.id=#{item.id} then #{item.lastLoginTime}
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="loginPwd=(case" suffix="ELSE loginPwd end),"> <trim prefix="lastLoginAddress=(case" suffix="ELSE lastLoginAddress end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('loginPwd')) or (colPickMode==1 and !item.containsKey('loginPwd'))"> <if test="(colPickMode==0 and item.containsKey('lastLoginAddress')) or (colPickMode==1 and !item.containsKey('lastLoginAddress'))">
when a.id=#{item.id} then #{item.loginPwd} when a.id=#{item.id} then #{item.lastLoginAddress}
</if> </if>
</foreach> </foreach>
</trim> </trim>
...@@ -604,6 +632,36 @@ ...@@ -604,6 +632,36 @@
${_conditionType_} a.id <![CDATA[ <= ]]> #{${_conditionParam_}.idEnd} ${_conditionType_} a.id <![CDATA[ <= ]]> #{${_conditionParam_}.idEnd}
</if> </if>
<if test="conditionParamRef.containsKey('loginName')">
<if test="conditionParamRef.loginName != null and conditionParamRef.loginName != ''">
${_conditionType_} a.loginName like #{${_conditionParam_}.loginName}
</if>
<if test="conditionParamRef.loginName == null">
${_conditionType_} a.loginName is null
</if>
</if>
<if test="conditionParamRef.containsKey('loginNameList')">
${_conditionType_} a.loginName in
<foreach collection="conditionParamRef.loginNameList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('loginPwd')">
<if test="conditionParamRef.loginPwd != null and conditionParamRef.loginPwd != ''">
${_conditionType_} a.loginPwd like #{${_conditionParam_}.loginPwd}
</if>
<if test="conditionParamRef.loginPwd == null">
${_conditionType_} a.loginPwd is null
</if>
</if>
<if test="conditionParamRef.containsKey('loginPwdList')">
${_conditionType_} a.loginPwd in
<foreach collection="conditionParamRef.loginPwdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('deptId')"> <if test="conditionParamRef.containsKey('deptId')">
<if test="conditionParamRef.deptId != null "> <if test="conditionParamRef.deptId != null ">
${_conditionType_} a.deptId = #{${_conditionParam_}.deptId} ${_conditionType_} a.deptId = #{${_conditionParam_}.deptId}
...@@ -1013,32 +1071,32 @@ ...@@ -1013,32 +1071,32 @@
${_conditionType_} a.updateTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') ${_conditionType_} a.updateTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
</if> </if>
<if test="conditionParamRef.containsKey('loginName')"> <if test="conditionParamRef.containsKey('lastLoginTime')">
<if test="conditionParamRef.loginName != null and conditionParamRef.loginName != ''"> <if test="conditionParamRef.lastLoginTime != null ">
${_conditionType_} a.loginName like #{${_conditionParam_}.loginName} ${_conditionType_} a.lastLoginTime = #{${_conditionParam_}.lastLoginTime}
</if> </if>
<if test="conditionParamRef.loginName == null"> <if test="conditionParamRef.lastLoginTime == null">
${_conditionType_} a.loginName is null ${_conditionType_} a.lastLoginTime is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('loginNameList')"> <if test="conditionParamRef.containsKey('lastLoginTimeStart') and conditionParamRef.lastLoginTimeStart != null and conditionParamRef.lastLoginTimeStart!=''">
${_conditionType_} a.loginName in ${_conditionType_} a.lastLoginTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.lastLoginTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
<foreach collection="conditionParamRef.loginNameList" open="(" close=")" index="index" item="item" separator=","> </if>
#{item} <if test="conditionParamRef.containsKey('lastLoginTimeEnd') and conditionParamRef.lastLoginTimeEnd != null and conditionParamRef.lastLoginTimeEnd!=''">
</foreach> ${_conditionType_} a.lastLoginTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.lastLoginTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
</if> </if>
<if test="conditionParamRef.containsKey('loginPwd')"> <if test="conditionParamRef.containsKey('lastLoginAddress')">
<if test="conditionParamRef.loginPwd != null and conditionParamRef.loginPwd != ''"> <if test="conditionParamRef.lastLoginAddress != null and conditionParamRef.lastLoginAddress != ''">
${_conditionType_} a.loginPwd like #{${_conditionParam_}.loginPwd} ${_conditionType_} a.lastLoginAddress like #{${_conditionParam_}.lastLoginAddress}
</if> </if>
<if test="conditionParamRef.loginPwd == null"> <if test="conditionParamRef.lastLoginAddress == null">
${_conditionType_} a.loginPwd is null ${_conditionType_} a.lastLoginAddress is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('loginPwdList')"> <if test="conditionParamRef.containsKey('lastLoginAddressList')">
${_conditionType_} a.loginPwd in ${_conditionType_} a.lastLoginAddress in
<foreach collection="conditionParamRef.loginPwdList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.lastLoginAddressList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
...@@ -1060,6 +1118,16 @@ ...@@ -1060,6 +1118,16 @@
<if test='orderCol.id != null and "DESC".equalsIgnoreCase(orderCol.id)'>DESC</if> <if test='orderCol.id != null and "DESC".equalsIgnoreCase(orderCol.id)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('loginName')">
a.loginName
<if test='orderCol.loginName != null and "DESC".equalsIgnoreCase(orderCol.loginName)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('loginPwd')">
a.loginPwd
<if test='orderCol.loginPwd != null and "DESC".equalsIgnoreCase(orderCol.loginPwd)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('deptId')"> <if test="orderCol.containsKey('deptId')">
a.deptId a.deptId
<if test='orderCol.deptId != null and "DESC".equalsIgnoreCase(orderCol.deptId)'>DESC</if> <if test='orderCol.deptId != null and "DESC".equalsIgnoreCase(orderCol.deptId)'>DESC</if>
...@@ -1180,14 +1248,14 @@ ...@@ -1180,14 +1248,14 @@
<if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if> <if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('loginName')"> <if test="orderCol.containsKey('lastLoginTime')">
a.loginName a.lastLoginTime
<if test='orderCol.loginName != null and "DESC".equalsIgnoreCase(orderCol.loginName)'>DESC</if> <if test='orderCol.lastLoginTime != null and "DESC".equalsIgnoreCase(orderCol.lastLoginTime)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('loginPwd')"> <if test="orderCol.containsKey('lastLoginAddress')">
a.loginPwd a.lastLoginAddress
<if test='orderCol.loginPwd != null and "DESC".equalsIgnoreCase(orderCol.loginPwd)'>DESC</if> <if test='orderCol.lastLoginAddress != null and "DESC".equalsIgnoreCase(orderCol.lastLoginAddress)'>DESC</if>
, ,
</if> </if>
</trim> </trim>
......
portal-manager/doc/api.md
View file @ 28fd9ccd
...@@ -954,14 +954,13 @@ data|object|数据对象 ...@@ -954,14 +954,13 @@ data|object|数据对象
&emsp;&emsp;roleCode|String|角色编码 &emsp;&emsp;roleCode|String|角色编码
&emsp;&emsp;roleSort|Integer|角色排序字段 &emsp;&emsp;roleSort|Integer|角色排序字段
&emsp;&emsp;remark|String|备注 &emsp;&emsp;remark|String|备注
&emsp;&emsp;roleType|Integer|角色状态（0.停用，1.启用）
&emsp;&emsp;menuIdList|Arrays|菜单ID列表,值为long &emsp;&emsp;menuIdList|Arrays|菜单ID列表,值为long
&emsp;&emsp;createTime|Date|创建时间 &emsp;&emsp;createTime|Date|创建时间
&emsp;&emsp;createUserId|Long|创建用户 &emsp;&emsp;createUserId|Long|创建用户
&emsp;&emsp;createUserName|String|创建用户名称 &emsp;&emsp;createUserName|String|创建用户名称
dict|object|字典对象 dict|object|字典对象
&emsp;roleType|object|字典属性对象，详见附录 &emsp;roleType|object|字典属性对象，详见附录
&emsp;roleType|object|字典属性对象，详见附录 &emsp;status|object|字典属性对象，详见附录
**响应消息样例:** **响应消息样例:**
``` ```
...@@ -1003,15 +1002,13 @@ data|object|数据对象 ...@@ -1003,15 +1002,13 @@ data|object|数据对象
&emsp;name|String|角色名称 &emsp;name|String|角色名称
&emsp;roleCode|String|角色编码 &emsp;roleCode|String|角色编码
&emsp;roleSort|Integer|角色排序字段 &emsp;roleSort|Integer|角色排序字段
&emsp;roleType|Integer|角色类型(0.系统内置角色，1.默认系统角色，2.普通角色)
&emsp;remark|String|备注 &emsp;remark|String|备注
&emsp;roleType|Integer|角色状态（0.停用，1.启用）
&emsp;createTime|Date|创建时间 &emsp;createTime|Date|创建时间
&emsp;createUserId|Long|创建用户 &emsp;createUserId|Long|创建用户
&emsp;createUserName|String|创建用户名称 &emsp;createUserName|String|创建用户名称
dict|object|字典对象 dict|object|字典对象
&emsp;roleType|object|字典属性对象，详见附录 &emsp;roleType|object|字典属性对象，详见附录
&emsp;roleType|object|字典属性对象，详见附录 &emsp;status|object|字典属性对象，详见附录
**响应消息样例:** **响应消息样例:**
``` ```
...@@ -1022,9 +1019,7 @@ dict|object|字典对象 ...@@ -1022,9 +1019,7 @@ dict|object|字典对象
"name":"c9szsk", "name":"c9szsk",
"roleCode":"c2f41g", "roleCode":"c2f41g",
"roleSort":2788, "roleSort":2788,
"roleType":541,
"remark":"tym2dx", "remark":"tym2dx",
"roleType":3737,
"createTime":"2022-06-02", "createTime":"2022-06-02",
"createUserId":5091, "createUserId":5091,
"createUserName":"zx9ud1" "createUserName":"zx9ud1"
...@@ -1049,9 +1044,7 @@ dict|object|字典对象 ...@@ -1049,9 +1044,7 @@ dict|object|字典对象
name|String|是|角色名称 name|String|是|角色名称
roleCode|String|是|角色编码 roleCode|String|是|角色编码
roleSort|Integer|是|角色排序字段 roleSort|Integer|是|角色排序字段
roleType|Integer|是|角色类型(0.系统内置角色，1.默认系统角色，2.普通角色)
remark|String|是|备注 remark|String|是|备注
roleType|Integer|是|角色状态（0.停用，1.启用）
createUserName|String|是|创建用户名称 createUserName|String|是|创建用户名称
**请求样例:** **请求样例:**
...@@ -1060,9 +1053,7 @@ createUserName|String|是|创建用户名称 ...@@ -1060,9 +1053,7 @@ createUserName|String|是|创建用户名称
"name":"i8scn3", "name":"i8scn3",
"roleCode":"nthtg2", "roleCode":"nthtg2",
"roleSort":3063, "roleSort":3063,
"roleType":6039,
"remark":"32xaq6", "remark":"32xaq6",
"roleType":3352,
"createUserName":"ztwqjn" "createUserName":"ztwqjn"
} }
...@@ -1080,9 +1071,7 @@ data|object|数据对象 ...@@ -1080,9 +1071,7 @@ data|object|数据对象
&emsp;&emsp;name|String|角色名称 &emsp;&emsp;name|String|角色名称
&emsp;&emsp;roleCode|String|角色编码 &emsp;&emsp;roleCode|String|角色编码
&emsp;&emsp;roleSort|Integer|角色排序字段 &emsp;&emsp;roleSort|Integer|角色排序字段
&emsp;&emsp;roleType|Integer|角色类型(0.系统内置角色，1.默认系统角色，2.普通角色)
&emsp;&emsp;remark|String|备注 &emsp;&emsp;remark|String|备注
&emsp;&emsp;roleType|Integer|角色状态（0.停用，1.启用）
&emsp;&emsp;createTime|Date|创建时间 &emsp;&emsp;createTime|Date|创建时间
&emsp;&emsp;createUserId|Long|创建用户 &emsp;&emsp;createUserId|Long|创建用户
&emsp;&emsp;createUserName|String|创建用户名称 &emsp;&emsp;createUserName|String|创建用户名称
...@@ -1297,6 +1286,7 @@ data|object|数据对象 ...@@ -1297,6 +1286,7 @@ data|object|数据对象
&emsp;&emsp;createTime|Date|创建时间 &emsp;&emsp;createTime|Date|创建时间
&emsp;&emsp;createUserId|Long|创建用户 &emsp;&emsp;createUserId|Long|创建用户
&emsp;&emsp;createUserName|String|创建用户名称 &emsp;&emsp;createUserName|String|创建用户名称
&emsp;&emsp;remark|String|描述备注
dict|object|字典对象 dict|object|字典对象
&emsp;linkType|object|字典属性对象，详见附录 &emsp;linkType|object|字典属性对象，详见附录
&emsp;visible|object|字典属性对象，详见附录 &emsp;visible|object|字典属性对象，详见附录
...@@ -1474,6 +1464,7 @@ data|object|数据对象 ...@@ -1474,6 +1464,7 @@ data|object|数据对象
&emsp;createTime|Date|创建时间 &emsp;createTime|Date|创建时间
&emsp;createUserId|Long|创建用户 &emsp;createUserId|Long|创建用户
&emsp;createUserName|String|创建用户名称 &emsp;createUserName|String|创建用户名称
&emsp;&emsp;remark|String|描述备注
dict|object|字典对象 dict|object|字典对象
&emsp;linkType|object|字典属性对象，详见附录 &emsp;linkType|object|字典属性对象，详见附录
&emsp;visible|object|字典属性对象，详见附录 &emsp;visible|object|字典属性对象，详见附录
...@@ -1501,7 +1492,8 @@ dict|object|字典对象 ...@@ -1501,7 +1492,8 @@ dict|object|字典对象
"orderId":6861, "orderId":6861,
"createTime":"2022-06-02", "createTime":"2022-06-02",
"createUserId":2189, "createUserId":2189,
"createUserName":"zov8bo" "createUserName":"zov8bo",
"remark":"zov8bo"
} }
} }
``` ```
...@@ -1532,7 +1524,7 @@ menuType|Integer|是|菜单类型(0.目录，1.菜单，2.按钮) ...@@ -1532,7 +1524,7 @@ menuType|Integer|是|菜单类型(0.目录，1.菜单，2.按钮)
status|Integer|是|菜单状态(0.禁用，1.启用) status|Integer|是|菜单状态(0.禁用，1.启用)
authType|Integer|是|权限类型(0.无限制，1.无需登录查看，2.需要登录查看，3.需要角色权限查看) authType|Integer|是|权限类型(0.无限制，1.无需登录查看，2.需要登录查看，3.需要角色权限查看)
orderId|Integer|是|排序编号 orderId|Integer|是|排序编号
createUserName|String|是|创建用户名称 remark|String|是|描述备注
**请求样例:** **请求样例:**
``` ```
...@@ -1548,7 +1540,8 @@ createUserName|String|是|创建用户名称 ...@@ -1548,7 +1540,8 @@ createUserName|String|是|创建用户名称
"menuType":0, "menuType":0,
"status":1, "status":1,
"authType":3, "authType":3,
"orderId":0 "orderId":0,
"remark":"qnglei"
} }
``` ```
...@@ -1577,6 +1570,7 @@ data|object|数据对象 ...@@ -1577,6 +1570,7 @@ data|object|数据对象
&emsp;&emsp;createTime|Date|创建时间 &emsp;&emsp;createTime|Date|创建时间
&emsp;&emsp;createUserId|Long|创建用户 &emsp;&emsp;createUserId|Long|创建用户
&emsp;&emsp;createUserName|String|创建用户名称 &emsp;&emsp;createUserName|String|创建用户名称
&emsp;&emsp;remark|String|描述备注
**响应消息样例:** **响应消息样例:**
``` ```
......
portal-manager/src/main/java/com/mortals/xhx/base/framework/interceptor/AuthUserInterceptor.java
View file @ 28fd9ccd
...@@ -64,7 +64,7 @@ public class AuthUserInterceptor extends BaseInterceptor { ...@@ -64,7 +64,7 @@ public class AuthUserInterceptor extends BaseInterceptor {
//不存在时候 如果是管理员也不做拦截 //不存在时候 如果是管理员也不做拦截
IUser loginUser = authTokenService.getLoginUser(request); IUser loginUser = authTokenService.getLoginUser(request);
if(ObjectUtils.isEmpty(loginUser)){ if(ObjectUtils.isEmpty(loginUser)){
ret.put("code", -1); ret.put("code", 401);
ret.put("msg", "用户未登录或登录失效，请重新登录"); ret.put("msg", "用户未登录或登录失效，请重新登录");
ServletUtils.renderString(response, JSONObject.toJSONString(ret)); ServletUtils.renderString(response, JSONObject.toJSONString(ret));
return false; return false;
......
portal-manager/src/main/java/com/mortals/xhx/module/menu/model/MenuEntity.java
View file @ 28fd9ccd
...@@ -7,260 +7,278 @@ import com.mortals.framework.annotation.Excel; ...@@ -7,260 +7,278 @@ import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong; import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.menu.model.vo.MenuVo; import com.mortals.xhx.module.menu.model.vo.MenuVo;
/** /**
* 菜单信息业务实体对象 * 菜单信息业务实体对象
* *
* @author zxfei * @author zxfei
* @date 2022-06-02 * @date 2022-08-02
*/ */
public class MenuEntity extends MenuVo { public class MenuEntity extends MenuVo {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** /**
* 菜单名称 * 菜单名称
*/ */
private String name; private String name;
/** /**
* 连接地址 * 连接地址
*/ */
private String url; private String url;
/** /**
* 父菜单ID，一级菜单的该字段值为-1 * 父菜单ID，一级菜单的该字段值为-1
*/ */
private Long parentId; private Long parentId;
/** /**
* 链接方式，(0.普通，1.弹出，2.脚本) * 链接方式，(0.普通，1.弹出，2.脚本)
*/ */
private Integer linkType; private Integer linkType;
/** /**
* 主菜单图标，主菜单图标的css样式名 * 主菜单图标，主菜单图标的css样式名
*/ */
private String imgPath; private String imgPath;
/** /**
* 按钮图标 * 按钮图标
*/ */
private String buttonImgPath; private String buttonImgPath;
/** /**
* 常用菜单图标 * 常用菜单图标
*/ */
private String imgCommPath; private String imgCommPath;
/** /**
* 菜单显示(0.隐藏，1.显示) * 菜单显示(0.隐藏，1.显示)
*/ */
private Integer visible; private Integer visible;
/** /**
* 菜单类型(0.目录，1.菜单，2.按钮) * 菜单类型(0.目录，1.菜单，2.按钮)
*/ */
private Integer menuType; private Integer menuType;
/** /**
* 菜单状态(0.禁用，1.启用) * 菜单状态(0.禁用，1.启用)
*/ */
private Integer status; private Integer status;
/** /**
* 权限类型(0.无限制，1.无需登录查看，2.需要登录查看，3.需要角色权限查看) * 权限类型(0.无限制，1.无需登录查看，2.需要登录查看，3.需要角色权限查看)
*/ */
private Integer authType; private Integer authType;
/** /**
* 排序编号 * 排序编号
*/ */
private Integer orderId; private Integer orderId;
/** /**
* 创建用户名称 * 创建用户名称
*/ */
private String createUserName; private String createUserName;
/**
* 描述备注
*/
private String remark;
public MenuEntity(){} public MenuEntity(){}
/** /**
* 获取 菜单名称 * 获取 菜单名称
* @return String * @return String
*/ */
public String getName(){ public String getName(){
return name; return name;
} }
/** /**
* 设置 菜单名称 * 设置 菜单名称
* @param name * @param name
*/ */
public void setName(String name){ public void setName(String name){
this.name = name; this.name = name;
} }
/** /**
* 获取 连接地址 * 获取 连接地址
* @return String * @return String
*/ */
public String getUrl(){ public String getUrl(){
return url; return url;
} }
/** /**
* 设置 连接地址 * 设置 连接地址
* @param url * @param url
*/ */
public void setUrl(String url){ public void setUrl(String url){
this.url = url; this.url = url;
} }
/** /**
* 获取 父菜单ID，一级菜单的该字段值为-1 * 获取 父菜单ID，一级菜单的该字段值为-1
* @return Long * @return Long
*/ */
public Long getParentId(){ public Long getParentId(){
return parentId; return parentId;
} }
/** /**
* 设置 父菜单ID，一级菜单的该字段值为-1 * 设置 父菜单ID，一级菜单的该字段值为-1
* @param parentId * @param parentId
*/ */
public void setParentId(Long parentId){ public void setParentId(Long parentId){
this.parentId = parentId; this.parentId = parentId;
} }
/** /**
* 获取 链接方式，(0.普通，1.弹出，2.脚本) * 获取 链接方式，(0.普通，1.弹出，2.脚本)
* @return Integer * @return Integer
*/ */
public Integer getLinkType(){ public Integer getLinkType(){
return linkType; return linkType;
} }
/** /**
* 设置 链接方式，(0.普通，1.弹出，2.脚本) * 设置 链接方式，(0.普通，1.弹出，2.脚本)
* @param linkType * @param linkType
*/ */
public void setLinkType(Integer linkType){ public void setLinkType(Integer linkType){
this.linkType = linkType; this.linkType = linkType;
} }
/** /**
* 获取 主菜单图标，主菜单图标的css样式名 * 获取 主菜单图标，主菜单图标的css样式名
* @return String * @return String
*/ */
public String getImgPath(){ public String getImgPath(){
return imgPath; return imgPath;
} }
/** /**
* 设置 主菜单图标，主菜单图标的css样式名 * 设置 主菜单图标，主菜单图标的css样式名
* @param imgPath * @param imgPath
*/ */
public void setImgPath(String imgPath){ public void setImgPath(String imgPath){
this.imgPath = imgPath; this.imgPath = imgPath;
} }
/** /**
* 获取 按钮图标 * 获取 按钮图标
* @return String * @return String
*/ */
public String getButtonImgPath(){ public String getButtonImgPath(){
return buttonImgPath; return buttonImgPath;
} }
/** /**
* 设置 按钮图标 * 设置 按钮图标
* @param buttonImgPath * @param buttonImgPath
*/ */
public void setButtonImgPath(String buttonImgPath){ public void setButtonImgPath(String buttonImgPath){
this.buttonImgPath = buttonImgPath; this.buttonImgPath = buttonImgPath;
} }
/** /**
* 获取 常用菜单图标 * 获取 常用菜单图标
* @return String * @return String
*/ */
public String getImgCommPath(){ public String getImgCommPath(){
return imgCommPath; return imgCommPath;
} }
/** /**
* 设置 常用菜单图标 * 设置 常用菜单图标
* @param imgCommPath * @param imgCommPath
*/ */
public void setImgCommPath(String imgCommPath){ public void setImgCommPath(String imgCommPath){
this.imgCommPath = imgCommPath; this.imgCommPath = imgCommPath;
} }
/** /**
* 获取 菜单显示(0.隐藏，1.显示) * 获取 菜单显示(0.隐藏，1.显示)
* @return Integer * @return Integer
*/ */
public Integer getVisible(){ public Integer getVisible(){
return visible; return visible;
} }
/** /**
* 设置 菜单显示(0.隐藏，1.显示) * 设置 菜单显示(0.隐藏，1.显示)
* @param visible * @param visible
*/ */
public void setVisible(Integer visible){ public void setVisible(Integer visible){
this.visible = visible; this.visible = visible;
} }
/** /**
* 获取 菜单类型(0.目录，1.菜单，2.按钮) * 获取 菜单类型(0.目录，1.菜单，2.按钮)
* @return Integer * @return Integer
*/ */
public Integer getMenuType(){ public Integer getMenuType(){
return menuType; return menuType;
} }
/** /**
* 设置 菜单类型(0.目录，1.菜单，2.按钮) * 设置 菜单类型(0.目录，1.菜单，2.按钮)
* @param menuType * @param menuType
*/ */
public void setMenuType(Integer menuType){ public void setMenuType(Integer menuType){
this.menuType = menuType; this.menuType = menuType;
} }
/** /**
* 获取 菜单状态(0.禁用，1.启用) * 获取 菜单状态(0.禁用，1.启用)
* @return Integer * @return Integer
*/ */
public Integer getStatus(){ public Integer getStatus(){
return status; return status;
} }
/** /**
* 设置 菜单状态(0.禁用，1.启用) * 设置 菜单状态(0.禁用，1.启用)
* @param status * @param status
*/ */
public void setStatus(Integer status){ public void setStatus(Integer status){
this.status = status; this.status = status;
} }
/** /**
* 获取 权限类型(0.无限制，1.无需登录查看，2.需要登录查看，3.需要角色权限查看) * 获取 权限类型(0.无限制，1.无需登录查看，2.需要登录查看，3.需要角色权限查看)
* @return Integer * @return Integer
*/ */
public Integer getAuthType(){ public Integer getAuthType(){
return authType; return authType;
} }
/** /**
* 设置 权限类型(0.无限制，1.无需登录查看，2.需要登录查看，3.需要角色权限查看) * 设置 权限类型(0.无限制，1.无需登录查看，2.需要登录查看，3.需要角色权限查看)
* @param authType * @param authType
*/ */
public void setAuthType(Integer authType){ public void setAuthType(Integer authType){
this.authType = authType; this.authType = authType;
} }
/** /**
* 获取 排序编号 * 获取 排序编号
* @return Integer * @return Integer
*/ */
public Integer getOrderId(){ public Integer getOrderId(){
return orderId; return orderId;
} }
/** /**
* 设置 排序编号 * 设置 排序编号
* @param orderId * @param orderId
*/ */
public void setOrderId(Integer orderId){ public void setOrderId(Integer orderId){
this.orderId = orderId; this.orderId = orderId;
} }
/** /**
* 获取 创建用户名称 * 获取 创建用户名称
* @return String * @return String
*/ */
public String getCreateUserName(){ public String getCreateUserName(){
return createUserName; return createUserName;
} }
/** /**
* 设置 创建用户名称 * 设置 创建用户名称
* @param createUserName * @param createUserName
*/ */
public void setCreateUserName(String createUserName){ public void setCreateUserName(String createUserName){
this.createUserName = createUserName; this.createUserName = createUserName;
} }
/**
* 获取 描述备注
* @return String
*/
public String getRemark(){
return remark;
}
/**
* 设置 描述备注
* @param remark
*/
public void setRemark(String remark){
this.remark = remark;
}
@Override @Override
public int hashCode() { public int hashCode() {
return this.getId().hashCode(); return this.getId().hashCode();
} }
@Override @Override
public boolean equals(Object obj) { public boolean equals(Object obj) {
...@@ -268,7 +286,7 @@ public class MenuEntity extends MenuVo { ...@@ -268,7 +286,7 @@ public class MenuEntity extends MenuVo {
if (obj instanceof MenuEntity) { if (obj instanceof MenuEntity) {
MenuEntity tmp = (MenuEntity) obj; MenuEntity tmp = (MenuEntity) obj;
if (this.getId() == tmp.getId()) { if (this.getId() == tmp.getId()) {
return true; return true;
} }
} }
return false; return false;
...@@ -289,35 +307,38 @@ public class MenuEntity extends MenuVo { ...@@ -289,35 +307,38 @@ public class MenuEntity extends MenuVo {
sb.append(",authType:").append(getAuthType()); sb.append(",authType:").append(getAuthType());
sb.append(",orderId:").append(getOrderId()); sb.append(",orderId:").append(getOrderId());
sb.append(",createUserName:").append(getCreateUserName()); sb.append(",createUserName:").append(getCreateUserName());
sb.append(",remark:").append(getRemark());
return sb.toString(); return sb.toString();
} }
public void initAttrValue(){ public void initAttrValue(){
this.name = ""; this.name = "";
this.url = "";
this.url = ""; this.parentId = null;
this.parentId = null; this.linkType = 0;
this.linkType = 0; this.imgPath = "";
this.imgPath = ""; this.buttonImgPath = "";
this.buttonImgPath = ""; this.imgCommPath = "";
this.imgCommPath = ""; this.visible = 1;
this.visible = 1; this.menuType = 0;
this.menuType = 0; this.status = 1;
this.status = 1; this.authType = 3;
this.authType = 3; this.orderId = 0;
this.orderId = 0; this.createUserName = "";
this.createUserName = ""; this.remark = "";
} }
} }
\ No newline at end of file
portal-manager/src/main/java/com/mortals/xhx/module/menu/model/MenuQuery.java
View file @ 28fd9ccd
...@@ -3,11 +3,11 @@ package com.mortals.xhx.module.menu.model; ...@@ -3,11 +3,11 @@ package com.mortals.xhx.module.menu.model;
import java.util.List; import java.util.List;
import com.mortals.xhx.module.menu.model.MenuEntity; import com.mortals.xhx.module.menu.model.MenuEntity;
/** /**
* 菜单信息业务查询对象 * 菜单信息业务查询对象
* *
* @author zxfei * @author zxfei
* @date 2022-06-02 * @date 2022-08-02
*/ */
public class MenuQuery extends MenuEntity { public class MenuQuery extends MenuEntity {
/** 开始 菜单ID，主键，自增长 */ /** 开始 菜单ID，主键，自增长 */
private Long idStart; private Long idStart;
...@@ -141,6 +141,9 @@ public class MenuQuery extends MenuEntity { ...@@ -141,6 +141,9 @@ public class MenuQuery extends MenuEntity {
/** 创建用户名称 */ /** 创建用户名称 */
private List<String> createUserNameList; private List<String> createUserNameList;
/** 描述备注 */
private List<String> remarkList;
/** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */ /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
private List<MenuQuery> orConditionList; private List<MenuQuery> orConditionList;
...@@ -150,1251 +153,1285 @@ public class MenuQuery extends MenuEntity { ...@@ -150,1251 +153,1285 @@ public class MenuQuery extends MenuEntity {
public MenuQuery(){} public MenuQuery(){}
/** /**
* 获取 开始 菜单ID，主键，自增长 * 获取 开始 菜单ID，主键，自增长
* @return idStart * @return idStart
*/ */
public Long getIdStart(){ public Long getIdStart(){
return this.idStart; return this.idStart;
} }
/** /**
* 设置 开始 菜单ID，主键，自增长 * 设置 开始 菜单ID，主键，自增长
* @param idStart * @param idStart
*/ */
public void setIdStart(Long idStart){ public void setIdStart(Long idStart){
this.idStart = idStart; this.idStart = idStart;
} }
/** /**
* 获取 结束 菜单ID，主键，自增长 * 获取 结束 菜单ID，主键，自增长
* @return $idEnd * @return $idEnd
*/ */
public Long getIdEnd(){ public Long getIdEnd(){
return this.idEnd; return this.idEnd;
} }
/** /**
* 设置 结束 菜单ID，主键，自增长 * 设置 结束 菜单ID，主键，自增长
* @param idEnd * @param idEnd
*/ */
public void setIdEnd(Long idEnd){ public void setIdEnd(Long idEnd){
this.idEnd = idEnd; this.idEnd = idEnd;
} }
/** /**
* 获取 增加 菜单ID，主键，自增长 * 获取 增加 菜单ID，主键，自增长
* @return idIncrement * @return idIncrement
*/ */
public Long getIdIncrement(){ public Long getIdIncrement(){
return this.idIncrement; return this.idIncrement;
} }
/** /**
* 设置 增加 菜单ID，主键，自增长 * 设置 增加 菜单ID，主键，自增长
* @param idIncrement * @param idIncrement
*/ */
public void setIdIncrement(Long idIncrement){ public void setIdIncrement(Long idIncrement){
this.idIncrement = idIncrement; this.idIncrement = idIncrement;
} }
/** /**
* 获取 菜单ID，主键，自增长 * 获取 菜单ID，主键，自增长
* @return idList * @return idList
*/ */
public List<Long> getIdList(){ public List<Long> getIdList(){
return this.idList; return this.idList;
} }
/** /**
* 设置 菜单ID，主键，自增长 * 设置 菜单ID，主键，自增长
* @param idList * @param idList
*/ */
public void setIdList(List<Long> idList){ public void setIdList(List<Long> idList){
this.idList = idList; this.idList = idList;
} }
/** /**
* 获取 菜单名称 * 获取 菜单名称
* @return nameList * @return nameList
*/ */
public List<String> getNameList(){ public List<String> getNameList(){
return this.nameList; return this.nameList;
} }
/** /**
* 设置 菜单名称 * 设置 菜单名称
* @param nameList * @param nameList
*/ */
public void setNameList(List<String> nameList){ public void setNameList(List<String> nameList){
this.nameList = nameList; this.nameList = nameList;
} }
/** /**
* 获取 连接地址 * 获取 连接地址
* @return urlList * @return urlList
*/ */
public List<String> getUrlList(){ public List<String> getUrlList(){
return this.urlList; return this.urlList;
} }
/** /**
* 设置 连接地址 * 设置 连接地址
* @param urlList * @param urlList
*/ */
public void setUrlList(List<String> urlList){ public void setUrlList(List<String> urlList){
this.urlList = urlList; this.urlList = urlList;
} }
/** /**
* 获取 开始 父菜单ID，一级菜单的该字段值为-1 * 获取 开始 父菜单ID，一级菜单的该字段值为-1
* @return parentIdStart * @return parentIdStart
*/ */
public Long getParentIdStart(){ public Long getParentIdStart(){
return this.parentIdStart; return this.parentIdStart;
} }
/** /**
* 设置 开始 父菜单ID，一级菜单的该字段值为-1 * 设置 开始 父菜单ID，一级菜单的该字段值为-1
* @param parentIdStart * @param parentIdStart
*/ */
public void setParentIdStart(Long parentIdStart){ public void setParentIdStart(Long parentIdStart){
this.parentIdStart = parentIdStart; this.parentIdStart = parentIdStart;
} }
/** /**
* 获取 结束 父菜单ID，一级菜单的该字段值为-1 * 获取 结束 父菜单ID，一级菜单的该字段值为-1
* @return $parentIdEnd * @return $parentIdEnd
*/ */
public Long getParentIdEnd(){ public Long getParentIdEnd(){
return this.parentIdEnd; return this.parentIdEnd;
} }
/** /**
* 设置 结束 父菜单ID，一级菜单的该字段值为-1 * 设置 结束 父菜单ID，一级菜单的该字段值为-1
* @param parentIdEnd * @param parentIdEnd
*/ */
public void setParentIdEnd(Long parentIdEnd){ public void setParentIdEnd(Long parentIdEnd){
this.parentIdEnd = parentIdEnd; this.parentIdEnd = parentIdEnd;
} }
/** /**
* 获取 增加 父菜单ID，一级菜单的该字段值为-1 * 获取 增加 父菜单ID，一级菜单的该字段值为-1
* @return parentIdIncrement * @return parentIdIncrement
*/ */
public Long getParentIdIncrement(){ public Long getParentIdIncrement(){
return this.parentIdIncrement; return this.parentIdIncrement;
} }
/** /**
* 设置 增加 父菜单ID，一级菜单的该字段值为-1 * 设置 增加 父菜单ID，一级菜单的该字段值为-1
* @param parentIdIncrement * @param parentIdIncrement
*/ */
public void setParentIdIncrement(Long parentIdIncrement){ public void setParentIdIncrement(Long parentIdIncrement){
this.parentIdIncrement = parentIdIncrement; this.parentIdIncrement = parentIdIncrement;
} }
/** /**
* 获取 父菜单ID，一级菜单的该字段值为-1 * 获取 父菜单ID，一级菜单的该字段值为-1
* @return parentIdList * @return parentIdList
*/ */
public List<Long> getParentIdList(){ public List<Long> getParentIdList(){
return this.parentIdList; return this.parentIdList;
} }
/** /**
* 设置 父菜单ID，一级菜单的该字段值为-1 * 设置 父菜单ID，一级菜单的该字段值为-1
* @param parentIdList * @param parentIdList
*/ */
public void setParentIdList(List<Long> parentIdList){ public void setParentIdList(List<Long> parentIdList){
this.parentIdList = parentIdList; this.parentIdList = parentIdList;
} }
/** /**
* 获取 开始 链接方式，(0.普通，1.弹出，2.脚本) * 获取 开始 链接方式，(0.普通，1.弹出，2.脚本)
* @return linkTypeStart * @return linkTypeStart
*/ */
public Integer getLinkTypeStart(){ public Integer getLinkTypeStart(){
return this.linkTypeStart; return this.linkTypeStart;
} }
/** /**
* 设置 开始 链接方式，(0.普通，1.弹出，2.脚本) * 设置 开始 链接方式，(0.普通，1.弹出，2.脚本)
* @param linkTypeStart * @param linkTypeStart
*/ */
public void setLinkTypeStart(Integer linkTypeStart){ public void setLinkTypeStart(Integer linkTypeStart){
this.linkTypeStart = linkTypeStart; this.linkTypeStart = linkTypeStart;
} }
/** /**
* 获取 结束 链接方式，(0.普通，1.弹出，2.脚本) * 获取 结束 链接方式，(0.普通，1.弹出，2.脚本)
* @return $linkTypeEnd * @return $linkTypeEnd
*/ */
public Integer getLinkTypeEnd(){ public Integer getLinkTypeEnd(){
return this.linkTypeEnd; return this.linkTypeEnd;
} }
/** /**
* 设置 结束 链接方式，(0.普通，1.弹出，2.脚本) * 设置 结束 链接方式，(0.普通，1.弹出，2.脚本)
* @param linkTypeEnd * @param linkTypeEnd
*/ */
public void setLinkTypeEnd(Integer linkTypeEnd){ public void setLinkTypeEnd(Integer linkTypeEnd){
this.linkTypeEnd = linkTypeEnd; this.linkTypeEnd = linkTypeEnd;
} }
/** /**
* 获取 增加 链接方式，(0.普通，1.弹出，2.脚本) * 获取 增加 链接方式，(0.普通，1.弹出，2.脚本)
* @return linkTypeIncrement * @return linkTypeIncrement
*/ */
public Integer getLinkTypeIncrement(){ public Integer getLinkTypeIncrement(){
return this.linkTypeIncrement; return this.linkTypeIncrement;
} }
/** /**
* 设置 增加 链接方式，(0.普通，1.弹出，2.脚本) * 设置 增加 链接方式，(0.普通，1.弹出，2.脚本)
* @param linkTypeIncrement * @param linkTypeIncrement
*/ */
public void setLinkTypeIncrement(Integer linkTypeIncrement){ public void setLinkTypeIncrement(Integer linkTypeIncrement){
this.linkTypeIncrement = linkTypeIncrement; this.linkTypeIncrement = linkTypeIncrement;
} }
/** /**
* 获取 链接方式，(0.普通，1.弹出，2.脚本) * 获取 链接方式，(0.普通，1.弹出，2.脚本)
* @return linkTypeList * @return linkTypeList
*/ */
public List<Integer> getLinkTypeList(){ public List<Integer> getLinkTypeList(){
return this.linkTypeList; return this.linkTypeList;
} }
/** /**
* 设置 链接方式，(0.普通，1.弹出，2.脚本) * 设置 链接方式，(0.普通，1.弹出，2.脚本)
* @param linkTypeList * @param linkTypeList
*/ */
public void setLinkTypeList(List<Integer> linkTypeList){ public void setLinkTypeList(List<Integer> linkTypeList){
this.linkTypeList = linkTypeList; this.linkTypeList = linkTypeList;
} }
/** /**
* 获取 主菜单图标，主菜单图标的css样式名 * 获取 主菜单图标，主菜单图标的css样式名
* @return imgPathList * @return imgPathList
*/ */
public List<String> getImgPathList(){ public List<String> getImgPathList(){
return this.imgPathList; return this.imgPathList;
} }
/** /**
* 设置 主菜单图标，主菜单图标的css样式名 * 设置 主菜单图标，主菜单图标的css样式名
* @param imgPathList * @param imgPathList
*/ */
public void setImgPathList(List<String> imgPathList){ public void setImgPathList(List<String> imgPathList){
this.imgPathList = imgPathList; this.imgPathList = imgPathList;
} }
/** /**
* 获取 按钮图标 * 获取 按钮图标
* @return buttonImgPathList * @return buttonImgPathList
*/ */
public List<String> getButtonImgPathList(){ public List<String> getButtonImgPathList(){
return this.buttonImgPathList; return this.buttonImgPathList;
} }
/** /**
* 设置 按钮图标 * 设置 按钮图标
* @param buttonImgPathList * @param buttonImgPathList
*/ */
public void setButtonImgPathList(List<String> buttonImgPathList){ public void setButtonImgPathList(List<String> buttonImgPathList){
this.buttonImgPathList = buttonImgPathList; this.buttonImgPathList = buttonImgPathList;
} }
/** /**
* 获取 常用菜单图标 * 获取 常用菜单图标
* @return imgCommPathList * @return imgCommPathList
*/ */
public List<String> getImgCommPathList(){ public List<String> getImgCommPathList(){
return this.imgCommPathList; return this.imgCommPathList;
} }
/** /**
* 设置 常用菜单图标 * 设置 常用菜单图标
* @param imgCommPathList * @param imgCommPathList
*/ */
public void setImgCommPathList(List<String> imgCommPathList){ public void setImgCommPathList(List<String> imgCommPathList){
this.imgCommPathList = imgCommPathList; this.imgCommPathList = imgCommPathList;
} }
/** /**
* 获取 开始 菜单显示(0.隐藏，1.显示) * 获取 开始 菜单显示(0.隐藏，1.显示)
* @return visibleStart * @return visibleStart
*/ */
public Integer getVisibleStart(){ public Integer getVisibleStart(){
return this.visibleStart; return this.visibleStart;
} }
/** /**
* 设置 开始 菜单显示(0.隐藏，1.显示) * 设置 开始 菜单显示(0.隐藏，1.显示)
* @param visibleStart * @param visibleStart
*/ */
public void setVisibleStart(Integer visibleStart){ public void setVisibleStart(Integer visibleStart){
this.visibleStart = visibleStart; this.visibleStart = visibleStart;
} }
/** /**
* 获取 结束 菜单显示(0.隐藏，1.显示) * 获取 结束 菜单显示(0.隐藏，1.显示)
* @return $visibleEnd * @return $visibleEnd
*/ */
public Integer getVisibleEnd(){ public Integer getVisibleEnd(){
return this.visibleEnd; return this.visibleEnd;
} }
/** /**
* 设置 结束 菜单显示(0.隐藏，1.显示) * 设置 结束 菜单显示(0.隐藏，1.显示)
* @param visibleEnd * @param visibleEnd
*/ */
public void setVisibleEnd(Integer visibleEnd){ public void setVisibleEnd(Integer visibleEnd){
this.visibleEnd = visibleEnd; this.visibleEnd = visibleEnd;
} }
/** /**
* 获取 增加 菜单显示(0.隐藏，1.显示) * 获取 增加 菜单显示(0.隐藏，1.显示)
* @return visibleIncrement * @return visibleIncrement
*/ */
public Integer getVisibleIncrement(){ public Integer getVisibleIncrement(){
return this.visibleIncrement; return this.visibleIncrement;
} }
/** /**
* 设置 增加 菜单显示(0.隐藏，1.显示) * 设置 增加 菜单显示(0.隐藏，1.显示)
* @param visibleIncrement * @param visibleIncrement
*/ */
public void setVisibleIncrement(Integer visibleIncrement){ public void setVisibleIncrement(Integer visibleIncrement){
this.visibleIncrement = visibleIncrement; this.visibleIncrement = visibleIncrement;
} }
/** /**
* 获取 菜单显示(0.隐藏，1.显示) * 获取 菜单显示(0.隐藏，1.显示)
* @return visibleList * @return visibleList
*/ */
public List<Integer> getVisibleList(){ public List<Integer> getVisibleList(){
return this.visibleList; return this.visibleList;
} }
/** /**
* 设置 菜单显示(0.隐藏，1.显示) * 设置 菜单显示(0.隐藏，1.显示)
* @param visibleList * @param visibleList
*/ */
public void setVisibleList(List<Integer> visibleList){ public void setVisibleList(List<Integer> visibleList){
this.visibleList = visibleList; this.visibleList = visibleList;
} }
/** /**
* 获取 开始 菜单类型(0.目录，1.菜单，2.按钮) * 获取 开始 菜单类型(0.目录，1.菜单，2.按钮)
* @return menuTypeStart * @return menuTypeStart
*/ */
public Integer getMenuTypeStart(){ public Integer getMenuTypeStart(){
return this.menuTypeStart; return this.menuTypeStart;
} }
/** /**
* 设置 开始 菜单类型(0.目录，1.菜单，2.按钮) * 设置 开始 菜单类型(0.目录，1.菜单，2.按钮)
* @param menuTypeStart * @param menuTypeStart
*/ */
public void setMenuTypeStart(Integer menuTypeStart){ public void setMenuTypeStart(Integer menuTypeStart){
this.menuTypeStart = menuTypeStart; this.menuTypeStart = menuTypeStart;
} }
/** /**
* 获取 结束 菜单类型(0.目录，1.菜单，2.按钮) * 获取 结束 菜单类型(0.目录，1.菜单，2.按钮)
* @return $menuTypeEnd * @return $menuTypeEnd
*/ */
public Integer getMenuTypeEnd(){ public Integer getMenuTypeEnd(){
return this.menuTypeEnd; return this.menuTypeEnd;
} }
/** /**
* 设置 结束 菜单类型(0.目录，1.菜单，2.按钮) * 设置 结束 菜单类型(0.目录，1.菜单，2.按钮)
* @param menuTypeEnd * @param menuTypeEnd
*/ */
public void setMenuTypeEnd(Integer menuTypeEnd){ public void setMenuTypeEnd(Integer menuTypeEnd){
this.menuTypeEnd = menuTypeEnd; this.menuTypeEnd = menuTypeEnd;
} }
/** /**
* 获取 增加 菜单类型(0.目录，1.菜单，2.按钮) * 获取 增加 菜单类型(0.目录，1.菜单，2.按钮)
* @return menuTypeIncrement * @return menuTypeIncrement
*/ */
public Integer getMenuTypeIncrement(){ public Integer getMenuTypeIncrement(){
return this.menuTypeIncrement; return this.menuTypeIncrement;
} }
/** /**
* 设置 增加 菜单类型(0.目录，1.菜单，2.按钮) * 设置 增加 菜单类型(0.目录，1.菜单，2.按钮)
* @param menuTypeIncrement * @param menuTypeIncrement
*/ */
public void setMenuTypeIncrement(Integer menuTypeIncrement){ public void setMenuTypeIncrement(Integer menuTypeIncrement){
this.menuTypeIncrement = menuTypeIncrement; this.menuTypeIncrement = menuTypeIncrement;
} }
/** /**
* 获取 菜单类型(0.目录，1.菜单，2.按钮) * 获取 菜单类型(0.目录，1.菜单，2.按钮)
* @return menuTypeList * @return menuTypeList
*/ */
public List<Integer> getMenuTypeList(){ public List<Integer> getMenuTypeList(){
return this.menuTypeList; return this.menuTypeList;
} }
/** /**
* 设置 菜单类型(0.目录，1.菜单，2.按钮) * 设置 菜单类型(0.目录，1.菜单，2.按钮)
* @param menuTypeList * @param menuTypeList
*/ */
public void setMenuTypeList(List<Integer> menuTypeList){ public void setMenuTypeList(List<Integer> menuTypeList){
this.menuTypeList = menuTypeList; this.menuTypeList = menuTypeList;
} }
/** /**
* 获取 开始 菜单状态(0.禁用，1.启用) * 获取 开始 菜单状态(0.禁用，1.启用)
* @return statusStart * @return statusStart
*/ */
public Integer getStatusStart(){ public Integer getStatusStart(){
return this.statusStart; return this.statusStart;
} }
/** /**
* 设置 开始 菜单状态(0.禁用，1.启用) * 设置 开始 菜单状态(0.禁用，1.启用)
* @param statusStart * @param statusStart
*/ */
public void setStatusStart(Integer statusStart){ public void setStatusStart(Integer statusStart){
this.statusStart = statusStart; this.statusStart = statusStart;
} }
/** /**
* 获取 结束 菜单状态(0.禁用，1.启用) * 获取 结束 菜单状态(0.禁用，1.启用)
* @return $statusEnd * @return $statusEnd
*/ */
public Integer getStatusEnd(){ public Integer getStatusEnd(){
return this.statusEnd; return this.statusEnd;
} }
/** /**
* 设置 结束 菜单状态(0.禁用，1.启用) * 设置 结束 菜单状态(0.禁用，1.启用)
* @param statusEnd * @param statusEnd
*/ */
public void setStatusEnd(Integer statusEnd){ public void setStatusEnd(Integer statusEnd){
this.statusEnd = statusEnd; this.statusEnd = statusEnd;
} }
/** /**
* 获取 增加 菜单状态(0.禁用，1.启用) * 获取 增加 菜单状态(0.禁用，1.启用)
* @return statusIncrement * @return statusIncrement
*/ */
public Integer getStatusIncrement(){ public Integer getStatusIncrement(){
return this.statusIncrement; return this.statusIncrement;
} }
/** /**
* 设置 增加 菜单状态(0.禁用，1.启用) * 设置 增加 菜单状态(0.禁用，1.启用)
* @param statusIncrement * @param statusIncrement
*/ */
public void setStatusIncrement(Integer statusIncrement){ public void setStatusIncrement(Integer statusIncrement){
this.statusIncrement = statusIncrement; this.statusIncrement = statusIncrement;
} }
/** /**
* 获取 菜单状态(0.禁用，1.启用) * 获取 菜单状态(0.禁用，1.启用)
* @return statusList * @return statusList
*/ */
public List<Integer> getStatusList(){ public List<Integer> getStatusList(){
return this.statusList; return this.statusList;
} }
/** /**
* 设置 菜单状态(0.禁用，1.启用) * 设置 菜单状态(0.禁用，1.启用)
* @param statusList * @param statusList
*/ */
public void setStatusList(List<Integer> statusList){ public void setStatusList(List<Integer> statusList){
this.statusList = statusList; this.statusList = statusList;
} }
/** /**
* 获取 开始 权限类型(0.无限制，1.无需登录查看，2.需要登录查看，3.需要角色权限查看) * 获取 开始 权限类型(0.无限制，1.无需登录查看，2.需要登录查看，3.需要角色权限查看)
* @return authTypeStart * @return authTypeStart
*/ */
public Integer getAuthTypeStart(){ public Integer getAuthTypeStart(){
return this.authTypeStart; return this.authTypeStart;
} }
/** /**
* 设置 开始 权限类型(0.无限制，1.无需登录查看，2.需要登录查看，3.需要角色权限查看) * 设置 开始 权限类型(0.无限制，1.无需登录查看，2.需要登录查看，3.需要角色权限查看)
* @param authTypeStart * @param authTypeStart
*/ */
public void setAuthTypeStart(Integer authTypeStart){ public void setAuthTypeStart(Integer authTypeStart){
this.authTypeStart = authTypeStart; this.authTypeStart = authTypeStart;
} }
/** /**
* 获取 结束 权限类型(0.无限制，1.无需登录查看，2.需要登录查看，3.需要角色权限查看) * 获取 结束 权限类型(0.无限制，1.无需登录查看，2.需要登录查看，3.需要角色权限查看)
* @return $authTypeEnd * @return $authTypeEnd
*/ */
public Integer getAuthTypeEnd(){ public Integer getAuthTypeEnd(){
return this.authTypeEnd; return this.authTypeEnd;
} }
/** /**
* 设置 结束 权限类型(0.无限制，1.无需登录查看，2.需要登录查看，3.需要角色权限查看) * 设置 结束 权限类型(0.无限制，1.无需登录查看，2.需要登录查看，3.需要角色权限查看)
* @param authTypeEnd * @param authTypeEnd
*/ */
public void setAuthTypeEnd(Integer authTypeEnd){ public void setAuthTypeEnd(Integer authTypeEnd){
this.authTypeEnd = authTypeEnd; this.authTypeEnd = authTypeEnd;
} }
/** /**
* 获取 增加 权限类型(0.无限制，1.无需登录查看，2.需要登录查看，3.需要角色权限查看) * 获取 增加 权限类型(0.无限制，1.无需登录查看，2.需要登录查看，3.需要角色权限查看)
* @return authTypeIncrement * @return authTypeIncrement
*/ */
public Integer getAuthTypeIncrement(){ public Integer getAuthTypeIncrement(){
return this.authTypeIncrement; return this.authTypeIncrement;
} }
/** /**
* 设置 增加 权限类型(0.无限制，1.无需登录查看，2.需要登录查看，3.需要角色权限查看) * 设置 增加 权限类型(0.无限制，1.无需登录查看，2.需要登录查看，3.需要角色权限查看)
* @param authTypeIncrement * @param authTypeIncrement
*/ */
public void setAuthTypeIncrement(Integer authTypeIncrement){ public void setAuthTypeIncrement(Integer authTypeIncrement){
this.authTypeIncrement = authTypeIncrement; this.authTypeIncrement = authTypeIncrement;
} }
/** /**
* 获取 权限类型(0.无限制，1.无需登录查看，2.需要登录查看，3.需要角色权限查看) * 获取 权限类型(0.无限制，1.无需登录查看，2.需要登录查看，3.需要角色权限查看)
* @return authTypeList * @return authTypeList
*/ */
public List<Integer> getAuthTypeList(){ public List<Integer> getAuthTypeList(){
return this.authTypeList; return this.authTypeList;
} }
/** /**
* 设置 权限类型(0.无限制，1.无需登录查看，2.需要登录查看，3.需要角色权限查看) * 设置 权限类型(0.无限制，1.无需登录查看，2.需要登录查看，3.需要角色权限查看)
* @param authTypeList * @param authTypeList
*/ */
public void setAuthTypeList(List<Integer> authTypeList){ public void setAuthTypeList(List<Integer> authTypeList){
this.authTypeList = authTypeList; this.authTypeList = authTypeList;
} }
/** /**
* 获取 开始 排序编号 * 获取 开始 排序编号
* @return orderIdStart * @return orderIdStart
*/ */
public Integer getOrderIdStart(){ public Integer getOrderIdStart(){
return this.orderIdStart; return this.orderIdStart;
} }
/** /**
* 设置 开始 排序编号 * 设置 开始 排序编号
* @param orderIdStart * @param orderIdStart
*/ */
public void setOrderIdStart(Integer orderIdStart){ public void setOrderIdStart(Integer orderIdStart){
this.orderIdStart = orderIdStart; this.orderIdStart = orderIdStart;
} }
/** /**
* 获取 结束 排序编号 * 获取 结束 排序编号
* @return $orderIdEnd * @return $orderIdEnd
*/ */
public Integer getOrderIdEnd(){ public Integer getOrderIdEnd(){
return this.orderIdEnd; return this.orderIdEnd;
} }
/** /**
* 设置 结束 排序编号 * 设置 结束 排序编号
* @param orderIdEnd * @param orderIdEnd
*/ */
public void setOrderIdEnd(Integer orderIdEnd){ public void setOrderIdEnd(Integer orderIdEnd){
this.orderIdEnd = orderIdEnd; this.orderIdEnd = orderIdEnd;
} }
/** /**
* 获取 增加 排序编号 * 获取 增加 排序编号
* @return orderIdIncrement * @return orderIdIncrement
*/ */
public Integer getOrderIdIncrement(){ public Integer getOrderIdIncrement(){
return this.orderIdIncrement; return this.orderIdIncrement;
} }
/** /**
* 设置 增加 排序编号 * 设置 增加 排序编号
* @param orderIdIncrement * @param orderIdIncrement
*/ */
public void setOrderIdIncrement(Integer orderIdIncrement){ public void setOrderIdIncrement(Integer orderIdIncrement){
this.orderIdIncrement = orderIdIncrement; this.orderIdIncrement = orderIdIncrement;
} }
/** /**
* 获取 排序编号 * 获取 排序编号
* @return orderIdList * @return orderIdList
*/ */
public List<Integer> getOrderIdList(){ public List<Integer> getOrderIdList(){
return this.orderIdList; return this.orderIdList;
} }
/** /**
* 设置 排序编号 * 设置 排序编号
* @param orderIdList * @param orderIdList
*/ */
public void setOrderIdList(List<Integer> orderIdList){ public void setOrderIdList(List<Integer> orderIdList){
this.orderIdList = orderIdList; this.orderIdList = orderIdList;
} }
/** /**
* 获取 开始 创建时间 * 获取 开始 创建时间
* @return createTimeStart * @return createTimeStart
*/ */
public String getCreateTimeStart(){ public String getCreateTimeStart(){
return this.createTimeStart; return this.createTimeStart;
} }
/** /**
* 设置 开始 创建时间 * 设置 开始 创建时间
* @param createTimeStart * @param createTimeStart
*/ */
public void setCreateTimeStart(String createTimeStart){ public void setCreateTimeStart(String createTimeStart){
this.createTimeStart = createTimeStart; this.createTimeStart = createTimeStart;
} }
/** /**
* 获取 结束 创建时间 * 获取 结束 创建时间
* @return createTimeEnd * @return createTimeEnd
*/ */
public String getCreateTimeEnd(){ public String getCreateTimeEnd(){
return this.createTimeEnd; return this.createTimeEnd;
} }
/** /**
* 设置 结束 创建时间 * 设置 结束 创建时间
* @param createTimeEnd * @param createTimeEnd
*/ */
public void setCreateTimeEnd(String createTimeEnd){ public void setCreateTimeEnd(String createTimeEnd){
this.createTimeEnd = createTimeEnd; this.createTimeEnd = createTimeEnd;
} }
/** /**
* 获取 开始 创建用户 * 获取 开始 创建用户
* @return createUserIdStart * @return createUserIdStart
*/ */
public Long getCreateUserIdStart(){ public Long getCreateUserIdStart(){
return this.createUserIdStart; return this.createUserIdStart;
} }
/** /**
* 设置 开始 创建用户 * 设置 开始 创建用户
* @param createUserIdStart * @param createUserIdStart
*/ */
public void setCreateUserIdStart(Long createUserIdStart){ public void setCreateUserIdStart(Long createUserIdStart){
this.createUserIdStart = createUserIdStart; this.createUserIdStart = createUserIdStart;
} }
/** /**
* 获取 结束 创建用户 * 获取 结束 创建用户
* @return $createUserIdEnd * @return $createUserIdEnd
*/ */
public Long getCreateUserIdEnd(){ public Long getCreateUserIdEnd(){
return this.createUserIdEnd; return this.createUserIdEnd;
} }
/** /**
* 设置 结束 创建用户 * 设置 结束 创建用户
* @param createUserIdEnd * @param createUserIdEnd
*/ */
public void setCreateUserIdEnd(Long createUserIdEnd){ public void setCreateUserIdEnd(Long createUserIdEnd){
this.createUserIdEnd = createUserIdEnd; this.createUserIdEnd = createUserIdEnd;
} }
/** /**
* 获取 增加 创建用户 * 获取 增加 创建用户
* @return createUserIdIncrement * @return createUserIdIncrement
*/ */
public Long getCreateUserIdIncrement(){ public Long getCreateUserIdIncrement(){
return this.createUserIdIncrement; return this.createUserIdIncrement;
} }
/** /**
* 设置 增加 创建用户 * 设置 增加 创建用户
* @param createUserIdIncrement * @param createUserIdIncrement
*/ */
public void setCreateUserIdIncrement(Long createUserIdIncrement){ public void setCreateUserIdIncrement(Long createUserIdIncrement){
this.createUserIdIncrement = createUserIdIncrement; this.createUserIdIncrement = createUserIdIncrement;
} }
/** /**
* 获取 创建用户 * 获取 创建用户
* @return createUserIdList * @return createUserIdList
*/ */
public List<Long> getCreateUserIdList(){ public List<Long> getCreateUserIdList(){
return this.createUserIdList; return this.createUserIdList;
} }
/** /**
* 设置 创建用户 * 设置 创建用户
* @param createUserIdList * @param createUserIdList
*/ */
public void setCreateUserIdList(List<Long> createUserIdList){ public void setCreateUserIdList(List<Long> createUserIdList){
this.createUserIdList = createUserIdList; this.createUserIdList = createUserIdList;
} }
/** /**
* 获取 创建用户名称 * 获取 创建用户名称
* @return createUserNameList * @return createUserNameList
*/ */
public List<String> getCreateUserNameList(){ public List<String> getCreateUserNameList(){
return this.createUserNameList; return this.createUserNameList;
} }
/** /**
* 设置 创建用户名称 * 设置 创建用户名称
* @param createUserNameList * @param createUserNameList
*/ */
public void setCreateUserNameList(List<String> createUserNameList){ public void setCreateUserNameList(List<String> createUserNameList){
this.createUserNameList = createUserNameList; this.createUserNameList = createUserNameList;
} }
/** /**
* 设置 菜单ID，主键，自增长 * 获取 描述备注
* @param id * @return remarkList
*/ */
public List<String> getRemarkList(){
return this.remarkList;
}
/**
* 设置 描述备注
* @param remarkList
*/
public void setRemarkList(List<String> remarkList){
this.remarkList = remarkList;
}
/**
* 设置 菜单ID，主键，自增长
* @param id
*/
public MenuQuery id(Long id){ public MenuQuery id(Long id){
setId(id); setId(id);
return this; return this;
} }
/** /**
* 设置 开始 菜单ID，主键，自增长 * 设置 开始 菜单ID，主键，自增长
* @param idStart * @param idStart
*/ */
public MenuQuery idStart(Long idStart){ public MenuQuery idStart(Long idStart){
this.idStart = idStart; this.idStart = idStart;
return this; return this;
} }
/** /**
* 设置 结束 菜单ID，主键，自增长 * 设置 结束 菜单ID，主键，自增长
* @param idEnd * @param idEnd
*/ */
public MenuQuery idEnd(Long idEnd){ public MenuQuery idEnd(Long idEnd){
this.idEnd = idEnd; this.idEnd = idEnd;
return this; return this;
} }
/** /**
* 设置 增加 菜单ID，主键，自增长 * 设置 增加 菜单ID，主键，自增长
* @param idIncrement * @param idIncrement
*/ */
public MenuQuery idIncrement(Long idIncrement){ public MenuQuery idIncrement(Long idIncrement){
this.idIncrement = idIncrement; this.idIncrement = idIncrement;
return this; return this;
} }
/** /**
* 设置 菜单ID，主键，自增长 * 设置 菜单ID，主键，自增长
* @param idList * @param idList
*/ */
public MenuQuery idList(List<Long> idList){ public MenuQuery idList(List<Long> idList){
this.idList = idList; this.idList = idList;
return this; return this;
} }
/** /**
* 设置 菜单名称 * 设置 菜单名称
* @param name * @param name
*/ */
public MenuQuery name(String name){ public MenuQuery name(String name){
setName(name); setName(name);
return this; return this;
} }
/** /**
* 设置 菜单名称 * 设置 菜单名称
* @param nameList * @param nameList
*/ */
public MenuQuery nameList(List<String> nameList){ public MenuQuery nameList(List<String> nameList){
this.nameList = nameList; this.nameList = nameList;
return this; return this;
} }
/** /**
* 设置 连接地址 * 设置 连接地址
* @param url * @param url
*/ */
public MenuQuery url(String url){ public MenuQuery url(String url){
setUrl(url); setUrl(url);
return this; return this;
} }
/** /**
* 设置 连接地址 * 设置 连接地址
* @param urlList * @param urlList
*/ */
public MenuQuery urlList(List<String> urlList){ public MenuQuery urlList(List<String> urlList){
this.urlList = urlList; this.urlList = urlList;
return this; return this;
} }
/** /**
* 设置 父菜单ID，一级菜单的该字段值为-1 * 设置 父菜单ID，一级菜单的该字段值为-1
* @param parentId * @param parentId
*/ */
public MenuQuery parentId(Long parentId){ public MenuQuery parentId(Long parentId){
setParentId(parentId); setParentId(parentId);
return this; return this;
} }
/** /**
* 设置 开始 父菜单ID，一级菜单的该字段值为-1 * 设置 开始 父菜单ID，一级菜单的该字段值为-1
* @param parentIdStart * @param parentIdStart
*/ */
public MenuQuery parentIdStart(Long parentIdStart){ public MenuQuery parentIdStart(Long parentIdStart){
this.parentIdStart = parentIdStart; this.parentIdStart = parentIdStart;
return this; return this;
} }
/** /**
* 设置 结束 父菜单ID，一级菜单的该字段值为-1 * 设置 结束 父菜单ID，一级菜单的该字段值为-1
* @param parentIdEnd * @param parentIdEnd
*/ */
public MenuQuery parentIdEnd(Long parentIdEnd){ public MenuQuery parentIdEnd(Long parentIdEnd){
this.parentIdEnd = parentIdEnd; this.parentIdEnd = parentIdEnd;
return this; return this;
} }
/** /**
* 设置 增加 父菜单ID，一级菜单的该字段值为-1 * 设置 增加 父菜单ID，一级菜单的该字段值为-1
* @param parentIdIncrement * @param parentIdIncrement
*/ */
public MenuQuery parentIdIncrement(Long parentIdIncrement){ public MenuQuery parentIdIncrement(Long parentIdIncrement){
this.parentIdIncrement = parentIdIncrement; this.parentIdIncrement = parentIdIncrement;
return this; return this;
} }
/** /**
* 设置 父菜单ID，一级菜单的该字段值为-1 * 设置 父菜单ID，一级菜单的该字段值为-1
* @param parentIdList * @param parentIdList
*/ */
public MenuQuery parentIdList(List<Long> parentIdList){ public MenuQuery parentIdList(List<Long> parentIdList){
this.parentIdList = parentIdList; this.parentIdList = parentIdList;
return this; return this;
} }
/** /**
* 设置 链接方式，(0.普通，1.弹出，2.脚本) * 设置 链接方式，(0.普通，1.弹出，2.脚本)
* @param linkType * @param linkType
*/ */
public MenuQuery linkType(Integer linkType){ public MenuQuery linkType(Integer linkType){
setLinkType(linkType); setLinkType(linkType);
return this; return this;
} }
/** /**
* 设置 开始 链接方式，(0.普通，1.弹出，2.脚本) * 设置 开始 链接方式，(0.普通，1.弹出，2.脚本)
* @param linkTypeStart * @param linkTypeStart
*/ */
public MenuQuery linkTypeStart(Integer linkTypeStart){ public MenuQuery linkTypeStart(Integer linkTypeStart){
this.linkTypeStart = linkTypeStart; this.linkTypeStart = linkTypeStart;
return this; return this;
} }
/** /**
* 设置 结束 链接方式，(0.普通，1.弹出，2.脚本) * 设置 结束 链接方式，(0.普通，1.弹出，2.脚本)
* @param linkTypeEnd * @param linkTypeEnd
*/ */
public MenuQuery linkTypeEnd(Integer linkTypeEnd){ public MenuQuery linkTypeEnd(Integer linkTypeEnd){
this.linkTypeEnd = linkTypeEnd; this.linkTypeEnd = linkTypeEnd;
return this; return this;
} }
/** /**
* 设置 增加 链接方式，(0.普通，1.弹出，2.脚本) * 设置 增加 链接方式，(0.普通，1.弹出，2.脚本)
* @param linkTypeIncrement * @param linkTypeIncrement
*/ */
public MenuQuery linkTypeIncrement(Integer linkTypeIncrement){ public MenuQuery linkTypeIncrement(Integer linkTypeIncrement){
this.linkTypeIncrement = linkTypeIncrement; this.linkTypeIncrement = linkTypeIncrement;
return this; return this;
} }
/** /**
* 设置 链接方式，(0.普通，1.弹出，2.脚本) * 设置 链接方式，(0.普通，1.弹出，2.脚本)
* @param linkTypeList * @param linkTypeList
*/ */
public MenuQuery linkTypeList(List<Integer> linkTypeList){ public MenuQuery linkTypeList(List<Integer> linkTypeList){
this.linkTypeList = linkTypeList; this.linkTypeList = linkTypeList;
return this; return this;
} }
/** /**
* 设置 主菜单图标，主菜单图标的css样式名 * 设置 主菜单图标，主菜单图标的css样式名
* @param imgPath * @param imgPath
*/ */
public MenuQuery imgPath(String imgPath){ public MenuQuery imgPath(String imgPath){
setImgPath(imgPath); setImgPath(imgPath);
return this; return this;
} }
/** /**
* 设置 主菜单图标，主菜单图标的css样式名 * 设置 主菜单图标，主菜单图标的css样式名
* @param imgPathList * @param imgPathList
*/ */
public MenuQuery imgPathList(List<String> imgPathList){ public MenuQuery imgPathList(List<String> imgPathList){
this.imgPathList = imgPathList; this.imgPathList = imgPathList;
return this; return this;
} }
/** /**
* 设置 按钮图标 * 设置 按钮图标
* @param buttonImgPath * @param buttonImgPath
*/ */
public MenuQuery buttonImgPath(String buttonImgPath){ public MenuQuery buttonImgPath(String buttonImgPath){
setButtonImgPath(buttonImgPath); setButtonImgPath(buttonImgPath);
return this; return this;
} }
/** /**
* 设置 按钮图标 * 设置 按钮图标
* @param buttonImgPathList * @param buttonImgPathList
*/ */
public MenuQuery buttonImgPathList(List<String> buttonImgPathList){ public MenuQuery buttonImgPathList(List<String> buttonImgPathList){
this.buttonImgPathList = buttonImgPathList; this.buttonImgPathList = buttonImgPathList;
return this; return this;
} }
/** /**
* 设置 常用菜单图标 * 设置 常用菜单图标
* @param imgCommPath * @param imgCommPath
*/ */
public MenuQuery imgCommPath(String imgCommPath){ public MenuQuery imgCommPath(String imgCommPath){
setImgCommPath(imgCommPath); setImgCommPath(imgCommPath);
return this; return this;
} }
/** /**
* 设置 常用菜单图标 * 设置 常用菜单图标
* @param imgCommPathList * @param imgCommPathList
*/ */
public MenuQuery imgCommPathList(List<String> imgCommPathList){ public MenuQuery imgCommPathList(List<String> imgCommPathList){
this.imgCommPathList = imgCommPathList; this.imgCommPathList = imgCommPathList;
return this; return this;
} }
/** /**
* 设置 菜单显示(0.隐藏，1.显示) * 设置 菜单显示(0.隐藏，1.显示)
* @param visible * @param visible
*/ */
public MenuQuery visible(Integer visible){ public MenuQuery visible(Integer visible){
setVisible(visible); setVisible(visible);
return this; return this;
} }
/** /**
* 设置 开始 菜单显示(0.隐藏，1.显示) * 设置 开始 菜单显示(0.隐藏，1.显示)
* @param visibleStart * @param visibleStart
*/ */
public MenuQuery visibleStart(Integer visibleStart){ public MenuQuery visibleStart(Integer visibleStart){
this.visibleStart = visibleStart; this.visibleStart = visibleStart;
return this; return this;
} }
/** /**
* 设置 结束 菜单显示(0.隐藏，1.显示) * 设置 结束 菜单显示(0.隐藏，1.显示)
* @param visibleEnd * @param visibleEnd
*/ */
public MenuQuery visibleEnd(Integer visibleEnd){ public MenuQuery visibleEnd(Integer visibleEnd){
this.visibleEnd = visibleEnd; this.visibleEnd = visibleEnd;
return this; return this;
} }
/** /**
* 设置 增加 菜单显示(0.隐藏，1.显示) * 设置 增加 菜单显示(0.隐藏，1.显示)
* @param visibleIncrement * @param visibleIncrement
*/ */
public MenuQuery visibleIncrement(Integer visibleIncrement){ public MenuQuery visibleIncrement(Integer visibleIncrement){
this.visibleIncrement = visibleIncrement; this.visibleIncrement = visibleIncrement;
return this; return this;
} }
/** /**
* 设置 菜单显示(0.隐藏，1.显示) * 设置 菜单显示(0.隐藏，1.显示)
* @param visibleList * @param visibleList
*/ */
public MenuQuery visibleList(List<Integer> visibleList){ public MenuQuery visibleList(List<Integer> visibleList){
this.visibleList = visibleList; this.visibleList = visibleList;
return this; return this;
} }
/** /**
* 设置 菜单类型(0.目录，1.菜单，2.按钮) * 设置 菜单类型(0.目录，1.菜单，2.按钮)
* @param menuType * @param menuType
*/ */
public MenuQuery menuType(Integer menuType){ public MenuQuery menuType(Integer menuType){
setMenuType(menuType); setMenuType(menuType);
return this; return this;
} }
/** /**
* 设置 开始 菜单类型(0.目录，1.菜单，2.按钮) * 设置 开始 菜单类型(0.目录，1.菜单，2.按钮)
* @param menuTypeStart * @param menuTypeStart
*/ */
public MenuQuery menuTypeStart(Integer menuTypeStart){ public MenuQuery menuTypeStart(Integer menuTypeStart){
this.menuTypeStart = menuTypeStart; this.menuTypeStart = menuTypeStart;
return this; return this;
} }
/** /**
* 设置 结束 菜单类型(0.目录，1.菜单，2.按钮) * 设置 结束 菜单类型(0.目录，1.菜单，2.按钮)
* @param menuTypeEnd * @param menuTypeEnd
*/ */
public MenuQuery menuTypeEnd(Integer menuTypeEnd){ public MenuQuery menuTypeEnd(Integer menuTypeEnd){
this.menuTypeEnd = menuTypeEnd; this.menuTypeEnd = menuTypeEnd;
return this; return this;
} }
/** /**
* 设置 增加 菜单类型(0.目录，1.菜单，2.按钮) * 设置 增加 菜单类型(0.目录，1.菜单，2.按钮)
* @param menuTypeIncrement * @param menuTypeIncrement
*/ */
public MenuQuery menuTypeIncrement(Integer menuTypeIncrement){ public MenuQuery menuTypeIncrement(Integer menuTypeIncrement){
this.menuTypeIncrement = menuTypeIncrement; this.menuTypeIncrement = menuTypeIncrement;
return this; return this;
} }
/** /**
* 设置 菜单类型(0.目录，1.菜单，2.按钮) * 设置 菜单类型(0.目录，1.菜单，2.按钮)
* @param menuTypeList * @param menuTypeList
*/ */
public MenuQuery menuTypeList(List<Integer> menuTypeList){ public MenuQuery menuTypeList(List<Integer> menuTypeList){
this.menuTypeList = menuTypeList; this.menuTypeList = menuTypeList;
return this; return this;
} }
/** /**
* 设置 菜单状态(0.禁用，1.启用) * 设置 菜单状态(0.禁用，1.启用)
* @param status * @param status
*/ */
public MenuQuery status(Integer status){ public MenuQuery status(Integer status){
setStatus(status); setStatus(status);
return this; return this;
} }
/** /**
* 设置 开始 菜单状态(0.禁用，1.启用) * 设置 开始 菜单状态(0.禁用，1.启用)
* @param statusStart * @param statusStart
*/ */
public MenuQuery statusStart(Integer statusStart){ public MenuQuery statusStart(Integer statusStart){
this.statusStart = statusStart; this.statusStart = statusStart;
return this; return this;
} }
/** /**
* 设置 结束 菜单状态(0.禁用，1.启用) * 设置 结束 菜单状态(0.禁用，1.启用)
* @param statusEnd * @param statusEnd
*/ */
public MenuQuery statusEnd(Integer statusEnd){ public MenuQuery statusEnd(Integer statusEnd){
this.statusEnd = statusEnd; this.statusEnd = statusEnd;
return this; return this;
} }
/** /**
* 设置 增加 菜单状态(0.禁用，1.启用) * 设置 增加 菜单状态(0.禁用，1.启用)
* @param statusIncrement * @param statusIncrement
*/ */
public MenuQuery statusIncrement(Integer statusIncrement){ public MenuQuery statusIncrement(Integer statusIncrement){
this.statusIncrement = statusIncrement; this.statusIncrement = statusIncrement;
return this; return this;
} }
/** /**
* 设置 菜单状态(0.禁用，1.启用) * 设置 菜单状态(0.禁用，1.启用)
* @param statusList * @param statusList
*/ */
public MenuQuery statusList(List<Integer> statusList){ public MenuQuery statusList(List<Integer> statusList){
this.statusList = statusList; this.statusList = statusList;
return this; return this;
} }
/** /**
* 设置 权限类型(0.无限制，1.无需登录查看，2.需要登录查看，3.需要角色权限查看) * 设置 权限类型(0.无限制，1.无需登录查看，2.需要登录查看，3.需要角色权限查看)
* @param authType * @param authType
*/ */
public MenuQuery authType(Integer authType){ public MenuQuery authType(Integer authType){
setAuthType(authType); setAuthType(authType);
return this; return this;
} }
/** /**
* 设置 开始 权限类型(0.无限制，1.无需登录查看，2.需要登录查看，3.需要角色权限查看) * 设置 开始 权限类型(0.无限制，1.无需登录查看，2.需要登录查看，3.需要角色权限查看)
* @param authTypeStart * @param authTypeStart
*/ */
public MenuQuery authTypeStart(Integer authTypeStart){ public MenuQuery authTypeStart(Integer authTypeStart){
this.authTypeStart = authTypeStart; this.authTypeStart = authTypeStart;
return this; return this;
} }
/** /**
* 设置 结束 权限类型(0.无限制，1.无需登录查看，2.需要登录查看，3.需要角色权限查看) * 设置 结束 权限类型(0.无限制，1.无需登录查看，2.需要登录查看，3.需要角色权限查看)
* @param authTypeEnd * @param authTypeEnd
*/ */
public MenuQuery authTypeEnd(Integer authTypeEnd){ public MenuQuery authTypeEnd(Integer authTypeEnd){
this.authTypeEnd = authTypeEnd; this.authTypeEnd = authTypeEnd;
return this; return this;
} }
/** /**
* 设置 增加 权限类型(0.无限制，1.无需登录查看，2.需要登录查看，3.需要角色权限查看) * 设置 增加 权限类型(0.无限制，1.无需登录查看，2.需要登录查看，3.需要角色权限查看)
* @param authTypeIncrement * @param authTypeIncrement
*/ */
public MenuQuery authTypeIncrement(Integer authTypeIncrement){ public MenuQuery authTypeIncrement(Integer authTypeIncrement){
this.authTypeIncrement = authTypeIncrement; this.authTypeIncrement = authTypeIncrement;
return this; return this;
} }
/** /**
* 设置 权限类型(0.无限制，1.无需登录查看，2.需要登录查看，3.需要角色权限查看) * 设置 权限类型(0.无限制，1.无需登录查看，2.需要登录查看，3.需要角色权限查看)
* @param authTypeList * @param authTypeList
*/ */
public MenuQuery authTypeList(List<Integer> authTypeList){ public MenuQuery authTypeList(List<Integer> authTypeList){
this.authTypeList = authTypeList; this.authTypeList = authTypeList;
return this; return this;
} }
/** /**
* 设置 排序编号 * 设置 排序编号
* @param orderId * @param orderId
*/ */
public MenuQuery orderId(Integer orderId){ public MenuQuery orderId(Integer orderId){
setOrderId(orderId); setOrderId(orderId);
return this; return this;
} }
/** /**
* 设置 开始 排序编号 * 设置 开始 排序编号
* @param orderIdStart * @param orderIdStart
*/ */
public MenuQuery orderIdStart(Integer orderIdStart){ public MenuQuery orderIdStart(Integer orderIdStart){
this.orderIdStart = orderIdStart; this.orderIdStart = orderIdStart;
return this; return this;
} }
/** /**
* 设置 结束 排序编号 * 设置 结束 排序编号
* @param orderIdEnd * @param orderIdEnd
*/ */
public MenuQuery orderIdEnd(Integer orderIdEnd){ public MenuQuery orderIdEnd(Integer orderIdEnd){
this.orderIdEnd = orderIdEnd; this.orderIdEnd = orderIdEnd;
return this; return this;
} }
/** /**
* 设置 增加 排序编号 * 设置 增加 排序编号
* @param orderIdIncrement * @param orderIdIncrement
*/ */
public MenuQuery orderIdIncrement(Integer orderIdIncrement){ public MenuQuery orderIdIncrement(Integer orderIdIncrement){
this.orderIdIncrement = orderIdIncrement; this.orderIdIncrement = orderIdIncrement;
return this; return this;
} }
/** /**
* 设置 排序编号 * 设置 排序编号
* @param orderIdList * @param orderIdList
*/ */
public MenuQuery orderIdList(List<Integer> orderIdList){ public MenuQuery orderIdList(List<Integer> orderIdList){
this.orderIdList = orderIdList; this.orderIdList = orderIdList;
return this; return this;
} }
/** /**
* 设置 创建用户 * 设置 创建用户
* @param createUserId * @param createUserId
*/ */
public MenuQuery createUserId(Long createUserId){ public MenuQuery createUserId(Long createUserId){
setCreateUserId(createUserId); setCreateUserId(createUserId);
return this; return this;
} }
/** /**
* 设置 开始 创建用户 * 设置 开始 创建用户
* @param createUserIdStart * @param createUserIdStart
*/ */
public MenuQuery createUserIdStart(Long createUserIdStart){ public MenuQuery createUserIdStart(Long createUserIdStart){
this.createUserIdStart = createUserIdStart; this.createUserIdStart = createUserIdStart;
return this; return this;
} }
/** /**
* 设置 结束 创建用户 * 设置 结束 创建用户
* @param createUserIdEnd * @param createUserIdEnd
*/ */
public MenuQuery createUserIdEnd(Long createUserIdEnd){ public MenuQuery createUserIdEnd(Long createUserIdEnd){
this.createUserIdEnd = createUserIdEnd; this.createUserIdEnd = createUserIdEnd;
return this; return this;
} }
/** /**
* 设置 增加 创建用户 * 设置 增加 创建用户
* @param createUserIdIncrement * @param createUserIdIncrement
*/ */
public MenuQuery createUserIdIncrement(Long createUserIdIncrement){ public MenuQuery createUserIdIncrement(Long createUserIdIncrement){
this.createUserIdIncrement = createUserIdIncrement; this.createUserIdIncrement = createUserIdIncrement;
return this; return this;
} }
/** /**
* 设置 创建用户 * 设置 创建用户
* @param createUserIdList * @param createUserIdList
*/ */
public MenuQuery createUserIdList(List<Long> createUserIdList){ public MenuQuery createUserIdList(List<Long> createUserIdList){
this.createUserIdList = createUserIdList; this.createUserIdList = createUserIdList;
return this; return this;
} }
/** /**
* 设置 创建用户名称 * 设置 创建用户名称
* @param createUserName * @param createUserName
*/ */
public MenuQuery createUserName(String createUserName){ public MenuQuery createUserName(String createUserName){
setCreateUserName(createUserName); setCreateUserName(createUserName);
return this; return this;
} }
/** /**
* 设置 创建用户名称 * 设置 创建用户名称
* @param createUserNameList * @param createUserNameList
*/ */
public MenuQuery createUserNameList(List<String> createUserNameList){ public MenuQuery createUserNameList(List<String> createUserNameList){
this.createUserNameList = createUserNameList; this.createUserNameList = createUserNameList;
return this; return this;
}
/**
* 设置 描述备注
* @param remark
*/
public MenuQuery remark(String remark){
setRemark(remark);
return this;
}
/**
* 设置 描述备注
* @param remarkList
*/
public MenuQuery remarkList(List<String> remarkList){
this.remarkList = remarkList;
return this;
} }
/** /**
* 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
* @return orConditionList * @return orConditionList
*/ */
public List<MenuQuery> getOrConditionList(){ public List<MenuQuery> getOrConditionList(){
return this.orConditionList; return this.orConditionList;
} }
/** /**
* 设置 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) * 设置 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
* @param orConditionList * @param orConditionList
*/ */
public void setOrConditionList(List<MenuQuery> orConditionList){ public void setOrConditionList(List<MenuQuery> orConditionList){
this.orConditionList = orConditionList; this.orConditionList = orConditionList;
} }
/** /**
* 获取 AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4) * 获取 AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
* @return andConditionList * @return andConditionList
*/ */
public List<MenuQuery> getAndConditionList(){ public List<MenuQuery> getAndConditionList(){
return this.andConditionList; return this.andConditionList;
} }
/** /**
* 设置 AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4) * 设置 AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
* @param andConditionList * @param andConditionList
*/ */
public void setAndConditionList(List<MenuQuery> andConditionList){ public void setAndConditionList(List<MenuQuery> andConditionList){
this.andConditionList = andConditionList; this.andConditionList = andConditionList;
} }
......
portal-manager/src/main/java/com/mortals/xhx/module/menu/service/impl/MenuServiceImpl.java
View file @ 28fd9ccd
...@@ -18,6 +18,7 @@ import com.mortals.xhx.feign.rsp.ApiResp; ...@@ -18,6 +18,7 @@ import com.mortals.xhx.feign.rsp.ApiResp;
import com.mortals.xhx.module.menu.model.MenuQuery; import com.mortals.xhx.module.menu.model.MenuQuery;
import com.mortals.xhx.module.menu.model.vo.MenuNodeVO; import com.mortals.xhx.module.menu.model.vo.MenuNodeVO;
import com.mortals.xhx.module.role.service.RoleModelService; import com.mortals.xhx.module.role.service.RoleModelService;
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.mortals.framework.service.impl.AbstractCRUDServiceImpl; import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
......
portal-manager/src/main/java/com/mortals/xhx/module/role/web/RoleController.java
View file @ 28fd9ccd
package com.mortals.xhx.module.role.web; package com.mortals.xhx.module.role.web;
import com.mortals.framework.exception.AppException;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController; import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
import com.mortals.xhx.module.param.service.ParamService; import com.mortals.xhx.module.param.service.ParamService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -51,9 +52,13 @@ public class RoleController extends BaseCRUDJsonBodyMappingController<RoleServic ...@@ -51,9 +52,13 @@ public class RoleController extends BaseCRUDJsonBodyMappingController<RoleServic
@Override @Override
protected void init(Map<String, Object> model, Context context) { protected void init(Map<String, Object> model, Context context) {
this.addDict(model, "roleType", paramService.getParamBySecondOrganize("Role", "roleType")); //this.addDict(model, "roleType", paramService.getParamBySecondOrganize("Role", "roleType"));
super.init(model, context); super.init(model, context);
} }
@Override
protected void saveBefore(RoleEntity entity, Map<String, Object> model, Context context) throws AppException {
entity.setRoleType(1);
entity.setStatus(1);
}
} }
\ No newline at end of file
portal-manager/src/main/java/com/mortals/xhx/module/user/model/vo/UserVo.java
View file @ 28fd9ccd
...@@ -54,6 +54,9 @@ public class UserVo extends BaseEntityLong { ...@@ -54,6 +54,9 @@ public class UserVo extends BaseEntityLong {
/** 查询条件 */ /** 查询条件 */
private String query; private String query;
private String oldPwd;
private String newPwd;
public static void main(String[] args) { public static void main(String[] args) {
UserQuery userEntity = new UserQuery(); UserQuery userEntity = new UserQuery();
......
portal-manager/src/main/java/com/mortals/xhx/module/user/web/UserController.java
View file @ 28fd9ccd
...@@ -160,10 +160,10 @@ public class UserController extends BaseCRUDJsonBodyMappingController<UserServic ...@@ -160,10 +160,10 @@ public class UserController extends BaseCRUDJsonBodyMappingController<UserServic
@RequestMapping(value = "change/password", method = RequestMethod.POST) @RequestMapping(value = "change/password", method = RequestMethod.POST)
public String changePassword(@RequestParam String oldPwd, @RequestParam String newPwd) { public String changePassword(@RequestBody UserEntity entity) {
JSONObject ret = new JSONObject(); JSONObject ret = new JSONObject();
try { try {
service.updateUserPwd(super.getCurUser().getLoginName(), oldPwd, newPwd); service.updateUserPwd(super.getCurUser().getLoginName(), entity.getOldPwd(), entity.getNewPwd());
ret.put(KEY_RESULT_CODE, VALUE_RESULT_SUCCESS); ret.put(KEY_RESULT_CODE, VALUE_RESULT_SUCCESS);
ret.put(KEY_RESULT_MSG, "密码修改成功！"); ret.put(KEY_RESULT_MSG, "密码修改成功！");
} catch (Exception e) { } catch (Exception e) {
......
portal-manager/src/main/resources/sqlmap/module/menu/MenuMapper.xml
View file @ 28fd9ccd
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"mybatis-3-mapper.dtd"> "mybatis-3-mapper.dtd">
<mapper namespace="com.mortals.xhx.module.menu.dao.ibatis.MenuDaoImpl"> <mapper namespace="com.mortals.xhx.module.menu.dao.ibatis.MenuDaoImpl">
<!-- 字段和属性映射 --> <!-- 字段和属性映射 -->
<resultMap type="MenuEntity" id="MenuEntity-Map"> <resultMap type="MenuEntity" id="MenuEntity-Map">
<id property="id" column="id" /> <id property="id" column="id" />
<result property="name" column="name" /> <result property="name" column="name" />
<result property="url" column="url" /> <result property="url" column="url" />
<result property="parentId" column="parentId" /> <result property="parentId" column="parentId" />
<result property="linkType" column="linkType" /> <result property="linkType" column="linkType" />
<result property="imgPath" column="imgPath" /> <result property="imgPath" column="imgPath" />
<result property="buttonImgPath" column="buttonImgPath" /> <result property="buttonImgPath" column="buttonImgPath" />
<result property="imgCommPath" column="imgCommPath" /> <result property="imgCommPath" column="imgCommPath" />
<result property="visible" column="visible" /> <result property="visible" column="visible" />
<result property="menuType" column="menuType" /> <result property="menuType" column="menuType" />
<result property="status" column="status" /> <result property="status" column="status" />
<result property="authType" column="authType" /> <result property="authType" column="authType" />
<result property="orderId" column="orderId" /> <result property="orderId" column="orderId" />
<result property="createTime" column="createTime" /> <result property="createTime" column="createTime" />
<result property="createUserId" column="createUserId" /> <result property="createUserId" column="createUserId" />
<result property="createUserName" column="createUserName" /> <result property="createUserName" column="createUserName" />
<result property="remark" column="remark" />
</resultMap> </resultMap>
<!-- 表所有列 --> <!-- 表所有列 -->
<sql id="_columns"> <sql id="_columns">
<trim suffixOverrides="," suffix=""> <trim suffixOverrides="," suffix="">
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('id') or colPickMode == 1 and data.containsKey('id')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('id') or colPickMode == 1 and data.containsKey('id')))">
a.id, a.id,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('name') or colPickMode == 1 and data.containsKey('name')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('name') or colPickMode == 1 and data.containsKey('name')))">
a.name, a.name,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('url') or colPickMode == 1 and data.containsKey('url')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('url') or colPickMode == 1 and data.containsKey('url')))">
a.url, a.url,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('parentId') or colPickMode == 1 and data.containsKey('parentId')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('parentId') or colPickMode == 1 and data.containsKey('parentId')))">
a.parentId, a.parentId,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('linkType') or colPickMode == 1 and data.containsKey('linkType')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('linkType') or colPickMode == 1 and data.containsKey('linkType')))">
a.linkType, a.linkType,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('imgPath') or colPickMode == 1 and data.containsKey('imgPath')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('imgPath') or colPickMode == 1 and data.containsKey('imgPath')))">
a.imgPath, a.imgPath,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('buttonImgPath') or colPickMode == 1 and data.containsKey('buttonImgPath')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('buttonImgPath') or colPickMode == 1 and data.containsKey('buttonImgPath')))">
a.buttonImgPath, a.buttonImgPath,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('imgCommPath') or colPickMode == 1 and data.containsKey('imgCommPath')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('imgCommPath') or colPickMode == 1 and data.containsKey('imgCommPath')))">
a.imgCommPath, a.imgCommPath,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('visible') or colPickMode == 1 and data.containsKey('visible')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('visible') or colPickMode == 1 and data.containsKey('visible')))">
a.visible, a.visible,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('menuType') or colPickMode == 1 and data.containsKey('menuType')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('menuType') or colPickMode == 1 and data.containsKey('menuType')))">
a.menuType, a.menuType,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('status') or colPickMode == 1 and data.containsKey('status')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('status') or colPickMode == 1 and data.containsKey('status')))">
a.status, a.status,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('authType') or colPickMode == 1 and data.containsKey('authType')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('authType') or colPickMode == 1 and data.containsKey('authType')))">
a.authType, a.authType,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('orderId') or colPickMode == 1 and data.containsKey('orderId')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('orderId') or colPickMode == 1 and data.containsKey('orderId')))">
a.orderId, a.orderId,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createTime') or colPickMode == 1 and data.containsKey('createTime')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createTime') or colPickMode == 1 and data.containsKey('createTime')))">
a.createTime, a.createTime,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createUserId') or colPickMode == 1 and data.containsKey('createUserId')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createUserId') or colPickMode == 1 and data.containsKey('createUserId')))">
a.createUserId, a.createUserId,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createUserName') or colPickMode == 1 and data.containsKey('createUserName')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createUserName') or colPickMode == 1 and data.containsKey('createUserName')))">
a.createUserName, a.createUserName,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('remark') or colPickMode == 1 and data.containsKey('remark')))">
a.remark,
</if>
</trim> </trim>
</sql> </sql>
<!-- 新增 区分主键自增加还是业务插入 --> <!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="MenuEntity" useGeneratedKeys="true" keyProperty="id"> <insert id="insert" parameterType="MenuEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_xhx_menu insert into mortals_xhx_menu
(name,url,parentId,linkType,imgPath,buttonImgPath,imgCommPath,visible,menuType,status,authType,orderId,createTime,createUserId,createUserName) (name,url,parentId,linkType,imgPath,buttonImgPath,imgCommPath,visible,menuType,status,authType,orderId,createTime,createUserId,createUserName,remark)
VALUES VALUES
(#{name},#{url},#{parentId},#{linkType},#{imgPath},#{buttonImgPath},#{imgCommPath},#{visible},#{menuType},#{status},#{authType},#{orderId},#{createTime},#{createUserId},#{createUserName}) (#{name},#{url},#{parentId},#{linkType},#{imgPath},#{buttonImgPath},#{imgCommPath},#{visible},#{menuType},#{status},#{authType},#{orderId},#{createTime},#{createUserId},#{createUserName},#{remark})
</insert> </insert>
<!-- 批量新增 --> <!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto"> <insert id="insertBatch" parameterType="paramDto">
insert into mortals_xhx_menu insert into mortals_xhx_menu
(name,url,parentId,linkType,imgPath,buttonImgPath,imgCommPath,visible,menuType,status,authType,orderId,createTime,createUserId,createUserName) (name,url,parentId,linkType,imgPath,buttonImgPath,imgCommPath,visible,menuType,status,authType,orderId,createTime,createUserId,createUserName,remark)
VALUES VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," > <foreach collection="data.dataList" item="item" index="index" separator="," >
(#{item.name},#{item.url},#{item.parentId},#{item.linkType},#{item.imgPath},#{item.buttonImgPath},#{item.imgCommPath},#{item.visible},#{item.menuType},#{item.status},#{item.authType},#{item.orderId},#{item.createTime},#{item.createUserId},#{item.createUserName}) (#{item.name},#{item.url},#{item.parentId},#{item.linkType},#{item.imgPath},#{item.buttonImgPath},#{item.imgCommPath},#{item.visible},#{item.menuType},#{item.status},#{item.authType},#{item.orderId},#{item.createTime},#{item.createUserId},#{item.createUserName},#{item.remark})
</foreach> </foreach>
</insert> </insert>
...@@ -171,6 +175,9 @@ ...@@ -171,6 +175,9 @@
<if test="(colPickMode==0 and data.containsKey('createUserName')) or (colPickMode==1 and !data.containsKey('createUserName'))"> <if test="(colPickMode==0 and data.containsKey('createUserName')) or (colPickMode==1 and !data.containsKey('createUserName'))">
a.createUserName=#{data.createUserName}, a.createUserName=#{data.createUserName},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('remark')) or (colPickMode==1 and !data.containsKey('remark'))">
a.remark=#{data.remark},
</if>
</trim> </trim>
<trim suffixOverrides="where" suffix=""> <trim suffixOverrides="where" suffix="">
where where
...@@ -183,151 +190,158 @@ ...@@ -183,151 +190,158 @@
<update id="updateBatch" parameterType="paramDto"> <update id="updateBatch" parameterType="paramDto">
update mortals_xhx_menu as a update mortals_xhx_menu as a
<trim prefix="set" suffixOverrides=","> <trim prefix="set" suffixOverrides=",">
<trim prefix="name=(case" suffix="ELSE name end),"> <trim prefix="name=(case" suffix="ELSE name end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('name')) or (colPickMode==1 and !item.containsKey('name'))"> <if test="(colPickMode==0 and item.containsKey('name')) or (colPickMode==1 and !item.containsKey('name'))">
when a.id=#{item.id} then #{item.name} when a.id=#{item.id} then #{item.name}
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="url=(case" suffix="ELSE url end),"> <trim prefix="url=(case" suffix="ELSE url end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('url')) or (colPickMode==1 and !item.containsKey('url'))"> <if test="(colPickMode==0 and item.containsKey('url')) or (colPickMode==1 and !item.containsKey('url'))">
when a.id=#{item.id} then #{item.url} when a.id=#{item.id} then #{item.url}
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="parentId=(case" suffix="ELSE parentId end),"> <trim prefix="parentId=(case" suffix="ELSE parentId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<choose> <choose>
<when test="(colPickMode==0 and item.containsKey('parentId')) or (colPickMode==1 and !item.containsKey('parentId'))"> <when test="(colPickMode==0 and item.containsKey('parentId')) or (colPickMode==1 and !item.containsKey('parentId'))">
when a.id=#{item.id} then #{item.parentId} when a.id=#{item.id} then #{item.parentId}
</when> </when>
<when test="(colPickMode==0 and item.containsKey('parentIdIncrement')) or (colPickMode==1 and !item.containsKey('parentIdIncrement'))"> <when test="(colPickMode==0 and item.containsKey('parentIdIncrement')) or (colPickMode==1 and !item.containsKey('parentIdIncrement'))">
when a.id=#{item.id} then ifnull(a.parentId,0) + #{item.parentIdIncrement} when a.id=#{item.id} then ifnull(a.parentId,0) + #{item.parentIdIncrement}
</when> </when>
</choose> </choose>
</foreach> </foreach>
</trim> </trim>
<trim prefix="linkType=(case" suffix="ELSE linkType end),"> <trim prefix="linkType=(case" suffix="ELSE linkType end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<choose> <choose>
<when test="(colPickMode==0 and item.containsKey('linkType')) or (colPickMode==1 and !item.containsKey('linkType'))"> <when test="(colPickMode==0 and item.containsKey('linkType')) or (colPickMode==1 and !item.containsKey('linkType'))">
when a.id=#{item.id} then #{item.linkType} when a.id=#{item.id} then #{item.linkType}
</when> </when>
<when test="(colPickMode==0 and item.containsKey('linkTypeIncrement')) or (colPickMode==1 and !item.containsKey('linkTypeIncrement'))"> <when test="(colPickMode==0 and item.containsKey('linkTypeIncrement')) or (colPickMode==1 and !item.containsKey('linkTypeIncrement'))">
when a.id=#{item.id} then ifnull(a.linkType,0) + #{item.linkTypeIncrement} when a.id=#{item.id} then ifnull(a.linkType,0) + #{item.linkTypeIncrement}
</when> </when>
</choose> </choose>
</foreach> </foreach>
</trim> </trim>
<trim prefix="imgPath=(case" suffix="ELSE imgPath end),"> <trim prefix="imgPath=(case" suffix="ELSE imgPath end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('imgPath')) or (colPickMode==1 and !item.containsKey('imgPath'))"> <if test="(colPickMode==0 and item.containsKey('imgPath')) or (colPickMode==1 and !item.containsKey('imgPath'))">
when a.id=#{item.id} then #{item.imgPath} when a.id=#{item.id} then #{item.imgPath}
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="buttonImgPath=(case" suffix="ELSE buttonImgPath end),"> <trim prefix="buttonImgPath=(case" suffix="ELSE buttonImgPath end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('buttonImgPath')) or (colPickMode==1 and !item.containsKey('buttonImgPath'))"> <if test="(colPickMode==0 and item.containsKey('buttonImgPath')) or (colPickMode==1 and !item.containsKey('buttonImgPath'))">
when a.id=#{item.id} then #{item.buttonImgPath} when a.id=#{item.id} then #{item.buttonImgPath}
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="imgCommPath=(case" suffix="ELSE imgCommPath end),"> <trim prefix="imgCommPath=(case" suffix="ELSE imgCommPath end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('imgCommPath')) or (colPickMode==1 and !item.containsKey('imgCommPath'))"> <if test="(colPickMode==0 and item.containsKey('imgCommPath')) or (colPickMode==1 and !item.containsKey('imgCommPath'))">
when a.id=#{item.id} then #{item.imgCommPath} when a.id=#{item.id} then #{item.imgCommPath}
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="visible=(case" suffix="ELSE visible end),"> <trim prefix="visible=(case" suffix="ELSE visible end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<choose> <choose>
<when test="(colPickMode==0 and item.containsKey('visible')) or (colPickMode==1 and !item.containsKey('visible'))"> <when test="(colPickMode==0 and item.containsKey('visible')) or (colPickMode==1 and !item.containsKey('visible'))">
when a.id=#{item.id} then #{item.visible} when a.id=#{item.id} then #{item.visible}
</when> </when>
<when test="(colPickMode==0 and item.containsKey('visibleIncrement')) or (colPickMode==1 and !item.containsKey('visibleIncrement'))"> <when test="(colPickMode==0 and item.containsKey('visibleIncrement')) or (colPickMode==1 and !item.containsKey('visibleIncrement'))">
when a.id=#{item.id} then ifnull(a.visible,0) + #{item.visibleIncrement} when a.id=#{item.id} then ifnull(a.visible,0) + #{item.visibleIncrement}
</when> </when>
</choose> </choose>
</foreach> </foreach>
</trim> </trim>
<trim prefix="menuType=(case" suffix="ELSE menuType end),"> <trim prefix="menuType=(case" suffix="ELSE menuType end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<choose> <choose>
<when test="(colPickMode==0 and item.containsKey('menuType')) or (colPickMode==1 and !item.containsKey('menuType'))"> <when test="(colPickMode==0 and item.containsKey('menuType')) or (colPickMode==1 and !item.containsKey('menuType'))">
when a.id=#{item.id} then #{item.menuType} when a.id=#{item.id} then #{item.menuType}
</when> </when>
<when test="(colPickMode==0 and item.containsKey('menuTypeIncrement')) or (colPickMode==1 and !item.containsKey('menuTypeIncrement'))"> <when test="(colPickMode==0 and item.containsKey('menuTypeIncrement')) or (colPickMode==1 and !item.containsKey('menuTypeIncrement'))">
when a.id=#{item.id} then ifnull(a.menuType,0) + #{item.menuTypeIncrement} when a.id=#{item.id} then ifnull(a.menuType,0) + #{item.menuTypeIncrement}
</when> </when>
</choose> </choose>
</foreach> </foreach>
</trim> </trim>
<trim prefix="status=(case" suffix="ELSE status end),"> <trim prefix="status=(case" suffix="ELSE status end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<choose> <choose>
<when test="(colPickMode==0 and item.containsKey('status')) or (colPickMode==1 and !item.containsKey('status'))"> <when test="(colPickMode==0 and item.containsKey('status')) or (colPickMode==1 and !item.containsKey('status'))">
when a.id=#{item.id} then #{item.status} when a.id=#{item.id} then #{item.status}
</when> </when>
<when test="(colPickMode==0 and item.containsKey('statusIncrement')) or (colPickMode==1 and !item.containsKey('statusIncrement'))"> <when test="(colPickMode==0 and item.containsKey('statusIncrement')) or (colPickMode==1 and !item.containsKey('statusIncrement'))">
when a.id=#{item.id} then ifnull(a.status,0) + #{item.statusIncrement} when a.id=#{item.id} then ifnull(a.status,0) + #{item.statusIncrement}
</when> </when>
</choose> </choose>
</foreach> </foreach>
</trim> </trim>
<trim prefix="authType=(case" suffix="ELSE authType end),"> <trim prefix="authType=(case" suffix="ELSE authType end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<choose> <choose>
<when test="(colPickMode==0 and item.containsKey('authType')) or (colPickMode==1 and !item.containsKey('authType'))"> <when test="(colPickMode==0 and item.containsKey('authType')) or (colPickMode==1 and !item.containsKey('authType'))">
when a.id=#{item.id} then #{item.authType} when a.id=#{item.id} then #{item.authType}
</when> </when>
<when test="(colPickMode==0 and item.containsKey('authTypeIncrement')) or (colPickMode==1 and !item.containsKey('authTypeIncrement'))"> <when test="(colPickMode==0 and item.containsKey('authTypeIncrement')) or (colPickMode==1 and !item.containsKey('authTypeIncrement'))">
when a.id=#{item.id} then ifnull(a.authType,0) + #{item.authTypeIncrement} when a.id=#{item.id} then ifnull(a.authType,0) + #{item.authTypeIncrement}
</when> </when>
</choose> </choose>
</foreach> </foreach>
</trim> </trim>
<trim prefix="orderId=(case" suffix="ELSE orderId end),"> <trim prefix="orderId=(case" suffix="ELSE orderId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<choose> <choose>
<when test="(colPickMode==0 and item.containsKey('orderId')) or (colPickMode==1 and !item.containsKey('orderId'))"> <when test="(colPickMode==0 and item.containsKey('orderId')) or (colPickMode==1 and !item.containsKey('orderId'))">
when a.id=#{item.id} then #{item.orderId} when a.id=#{item.id} then #{item.orderId}
</when> </when>
<when test="(colPickMode==0 and item.containsKey('orderIdIncrement')) or (colPickMode==1 and !item.containsKey('orderIdIncrement'))"> <when test="(colPickMode==0 and item.containsKey('orderIdIncrement')) or (colPickMode==1 and !item.containsKey('orderIdIncrement'))">
when a.id=#{item.id} then ifnull(a.orderId,0) + #{item.orderIdIncrement} when a.id=#{item.id} then ifnull(a.orderId,0) + #{item.orderIdIncrement}
</when> </when>
</choose> </choose>
</foreach> </foreach>
</trim> </trim>
<trim prefix="createTime=(case" suffix="ELSE createTime end),"> <trim prefix="createTime=(case" suffix="ELSE createTime end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('createTime')) or (colPickMode==1 and !item.containsKey('createTime'))"> <if test="(colPickMode==0 and item.containsKey('createTime')) or (colPickMode==1 and !item.containsKey('createTime'))">
when a.id=#{item.id} then #{item.createTime} when a.id=#{item.id} then #{item.createTime}
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="createUserId=(case" suffix="ELSE createUserId end),"> <trim prefix="createUserId=(case" suffix="ELSE createUserId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<choose> <choose>
<when test="(colPickMode==0 and item.containsKey('createUserId')) or (colPickMode==1 and !item.containsKey('createUserId'))"> <when test="(colPickMode==0 and item.containsKey('createUserId')) or (colPickMode==1 and !item.containsKey('createUserId'))">
when a.id=#{item.id} then #{item.createUserId} when a.id=#{item.id} then #{item.createUserId}
</when> </when>
<when test="(colPickMode==0 and item.containsKey('createUserIdIncrement')) or (colPickMode==1 and !item.containsKey('createUserIdIncrement'))"> <when test="(colPickMode==0 and item.containsKey('createUserIdIncrement')) or (colPickMode==1 and !item.containsKey('createUserIdIncrement'))">
when a.id=#{item.id} then ifnull(a.createUserId,0) + #{item.createUserIdIncrement} when a.id=#{item.id} then ifnull(a.createUserId,0) + #{item.createUserIdIncrement}
</when> </when>
</choose> </choose>
</foreach> </foreach>
</trim> </trim>
<trim prefix="createUserName=(case" suffix="ELSE createUserName end),"> <trim prefix="createUserName=(case" suffix="ELSE createUserName end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('createUserName')) or (colPickMode==1 and !item.containsKey('createUserName'))"> <if test="(colPickMode==0 and item.containsKey('createUserName')) or (colPickMode==1 and !item.containsKey('createUserName'))">
when a.id=#{item.id} then #{item.createUserName} when a.id=#{item.id} then #{item.createUserName}
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="remark=(case" suffix="ELSE remark end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('remark')) or (colPickMode==1 and !item.containsKey('remark'))">
when a.id=#{item.id} then #{item.remark}
</if>
</foreach>
</trim>
</trim> </trim>
where id in where id in
<foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")"> <foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
...@@ -429,393 +443,413 @@ ...@@ -429,393 +443,413 @@
${_conditionType_} a.id=#{${_conditionParam_}.id} ${_conditionType_} a.id=#{${_conditionParam_}.id}
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('id')"> <if test="conditionParamRef.containsKey('id')">
<if test="conditionParamRef.id != null "> <if test="conditionParamRef.id != null ">
${_conditionType_} a.id = #{${_conditionParam_}.id} ${_conditionType_} a.id = #{${_conditionParam_}.id}
</if>
<if test="conditionParamRef.id == null">
${_conditionType_} a.id is null
</if>
</if>
<if test="conditionParamRef.containsKey('idList')">
${_conditionType_} a.id in
<foreach collection="conditionParamRef.idList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('idStart') and conditionParamRef.idStart != null">
${_conditionType_} a.id <![CDATA[ >= ]]> #{${_conditionParam_}.idStart}
</if> </if>
<if test="conditionParamRef.containsKey('idEnd') and conditionParamRef.idEnd != null"> <if test="conditionParamRef.id == null">
${_conditionType_} a.id <![CDATA[ <= ]]> #{${_conditionParam_}.idEnd} ${_conditionType_} a.id is null
</if> </if>
</if>
<if test="conditionParamRef.containsKey('idList')">
${_conditionType_} a.id in
<foreach collection="conditionParamRef.idList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('idStart') and conditionParamRef.idStart != null">
${_conditionType_} a.id <![CDATA[ >= ]]> #{${_conditionParam_}.idStart}
</if>
<if test="conditionParamRef.containsKey('idEnd') and conditionParamRef.idEnd != null">
${_conditionType_} a.id <![CDATA[ <= ]]> #{${_conditionParam_}.idEnd}
</if>
<if test="conditionParamRef.containsKey('name')"> <if test="conditionParamRef.containsKey('name')">
<if test="conditionParamRef.name != null and conditionParamRef.name != ''"> <if test="conditionParamRef.name != null and conditionParamRef.name != ''">
${_conditionType_} a.name like #{${_conditionParam_}.name} ${_conditionType_} a.name like #{${_conditionParam_}.name}
</if>
<if test="conditionParamRef.name == null">
${_conditionType_} a.name is null
</if>
</if> </if>
<if test="conditionParamRef.containsKey('nameList')"> <if test="conditionParamRef.name == null">
${_conditionType_} a.name in ${_conditionType_} a.name is null
<foreach collection="conditionParamRef.nameList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if> </if>
</if>
<if test="conditionParamRef.containsKey('nameList')">
${_conditionType_} a.name in
<foreach collection="conditionParamRef.nameList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('url')"> <if test="conditionParamRef.containsKey('url')">
<if test="conditionParamRef.url != null and conditionParamRef.url != ''"> <if test="conditionParamRef.url != null and conditionParamRef.url != ''">
${_conditionType_} a.url like #{${_conditionParam_}.url} ${_conditionType_} a.url like #{${_conditionParam_}.url}
</if>
<if test="conditionParamRef.url == null">
${_conditionType_} a.url is null
</if>
</if>
<if test="conditionParamRef.containsKey('urlList')">
${_conditionType_} a.url in
<foreach collection="conditionParamRef.urlList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if> </if>
<if test="conditionParamRef.containsKey('parentId')"> <if test="conditionParamRef.url == null">
<if test="conditionParamRef.parentId != null "> ${_conditionType_} a.url is null
${_conditionType_} a.parentId = #{${_conditionParam_}.parentId}
</if>
<if test="conditionParamRef.parentId == null">
${_conditionType_} a.parentId is null
</if>
</if>
<if test="conditionParamRef.containsKey('parentIdList')">
${_conditionType_} a.parentId in
<foreach collection="conditionParamRef.parentIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if> </if>
<if test="conditionParamRef.containsKey('parentIdStart') and conditionParamRef.parentIdStart != null"> </if>
${_conditionType_} a.parentId <![CDATA[ >= ]]> #{${_conditionParam_}.parentIdStart} <if test="conditionParamRef.containsKey('urlList')">
${_conditionType_} a.url in
<foreach collection="conditionParamRef.urlList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('parentId')">
<if test="conditionParamRef.parentId != null ">
${_conditionType_} a.parentId = #{${_conditionParam_}.parentId}
</if> </if>
<if test="conditionParamRef.containsKey('parentIdEnd') and conditionParamRef.parentIdEnd != null"> <if test="conditionParamRef.parentId == null">
${_conditionType_} a.parentId <![CDATA[ <= ]]> #{${_conditionParam_}.parentIdEnd} ${_conditionType_} a.parentId is null
</if> </if>
</if>
<if test="conditionParamRef.containsKey('parentIdList')">
${_conditionType_} a.parentId in
<foreach collection="conditionParamRef.parentIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('parentIdStart') and conditionParamRef.parentIdStart != null">
${_conditionType_} a.parentId <![CDATA[ >= ]]> #{${_conditionParam_}.parentIdStart}
</if>
<if test="conditionParamRef.containsKey('parentIdEnd') and conditionParamRef.parentIdEnd != null">
${_conditionType_} a.parentId <![CDATA[ <= ]]> #{${_conditionParam_}.parentIdEnd}
</if>
<if test="conditionParamRef.containsKey('linkType')"> <if test="conditionParamRef.containsKey('linkType')">
<if test="conditionParamRef.linkType != null "> <if test="conditionParamRef.linkType != null ">
${_conditionType_} a.linkType = #{${_conditionParam_}.linkType} ${_conditionType_} a.linkType = #{${_conditionParam_}.linkType}
</if>
<if test="conditionParamRef.linkType == null">
${_conditionType_} a.linkType is null
</if>
</if> </if>
<if test="conditionParamRef.containsKey('linkTypeList')"> <if test="conditionParamRef.linkType == null">
${_conditionType_} a.linkType in ${_conditionType_} a.linkType is null
<foreach collection="conditionParamRef.linkTypeList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('linkTypeStart') and conditionParamRef.linkTypeStart != null">
${_conditionType_} a.linkType <![CDATA[ >= ]]> #{${_conditionParam_}.linkTypeStart}
</if>
<if test="conditionParamRef.containsKey('linkTypeEnd') and conditionParamRef.linkTypeEnd != null">
${_conditionType_} a.linkType <![CDATA[ <= ]]> #{${_conditionParam_}.linkTypeEnd}
</if> </if>
</if>
<if test="conditionParamRef.containsKey('linkTypeList')">
${_conditionType_} a.linkType in
<foreach collection="conditionParamRef.linkTypeList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('linkTypeStart') and conditionParamRef.linkTypeStart != null">
${_conditionType_} a.linkType <![CDATA[ >= ]]> #{${_conditionParam_}.linkTypeStart}
</if>
<if test="conditionParamRef.containsKey('linkTypeEnd') and conditionParamRef.linkTypeEnd != null">
${_conditionType_} a.linkType <![CDATA[ <= ]]> #{${_conditionParam_}.linkTypeEnd}
</if>
<if test="conditionParamRef.containsKey('imgPath')"> <if test="conditionParamRef.containsKey('imgPath')">
<if test="conditionParamRef.imgPath != null and conditionParamRef.imgPath != ''"> <if test="conditionParamRef.imgPath != null and conditionParamRef.imgPath != ''">
${_conditionType_} a.imgPath like #{${_conditionParam_}.imgPath} ${_conditionType_} a.imgPath like #{${_conditionParam_}.imgPath}
</if>
<if test="conditionParamRef.imgPath == null">
${_conditionType_} a.imgPath is null
</if>
</if> </if>
<if test="conditionParamRef.containsKey('imgPathList')"> <if test="conditionParamRef.imgPath == null">
${_conditionType_} a.imgPath in ${_conditionType_} a.imgPath is null
<foreach collection="conditionParamRef.imgPathList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if> </if>
</if>
<if test="conditionParamRef.containsKey('imgPathList')">
${_conditionType_} a.imgPath in
<foreach collection="conditionParamRef.imgPathList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('buttonImgPath')"> <if test="conditionParamRef.containsKey('buttonImgPath')">
<if test="conditionParamRef.buttonImgPath != null and conditionParamRef.buttonImgPath != ''"> <if test="conditionParamRef.buttonImgPath != null and conditionParamRef.buttonImgPath != ''">
${_conditionType_} a.buttonImgPath like #{${_conditionParam_}.buttonImgPath} ${_conditionType_} a.buttonImgPath like #{${_conditionParam_}.buttonImgPath}
</if>
<if test="conditionParamRef.buttonImgPath == null">
${_conditionType_} a.buttonImgPath is null
</if>
</if> </if>
<if test="conditionParamRef.containsKey('buttonImgPathList')"> <if test="conditionParamRef.buttonImgPath == null">
${_conditionType_} a.buttonImgPath in ${_conditionType_} a.buttonImgPath is null
<foreach collection="conditionParamRef.buttonImgPathList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if> </if>
</if>
<if test="conditionParamRef.containsKey('buttonImgPathList')">
${_conditionType_} a.buttonImgPath in
<foreach collection="conditionParamRef.buttonImgPathList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('imgCommPath')"> <if test="conditionParamRef.containsKey('imgCommPath')">
<if test="conditionParamRef.imgCommPath != null and conditionParamRef.imgCommPath != ''"> <if test="conditionParamRef.imgCommPath != null and conditionParamRef.imgCommPath != ''">
${_conditionType_} a.imgCommPath like #{${_conditionParam_}.imgCommPath} ${_conditionType_} a.imgCommPath like #{${_conditionParam_}.imgCommPath}
</if>
<if test="conditionParamRef.imgCommPath == null">
${_conditionType_} a.imgCommPath is null
</if>
</if> </if>
<if test="conditionParamRef.containsKey('imgCommPathList')"> <if test="conditionParamRef.imgCommPath == null">
${_conditionType_} a.imgCommPath in ${_conditionType_} a.imgCommPath is null
<foreach collection="conditionParamRef.imgCommPathList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if> </if>
<if test="conditionParamRef.containsKey('visible')"> </if>
<if test="conditionParamRef.visible != null "> <if test="conditionParamRef.containsKey('imgCommPathList')">
${_conditionType_} a.visible = #{${_conditionParam_}.visible} ${_conditionType_} a.imgCommPath in
</if> <foreach collection="conditionParamRef.imgCommPathList" open="(" close=")" index="index" item="item" separator=",">
<if test="conditionParamRef.visible == null"> #{item}
${_conditionType_} a.visible is null </foreach>
</if> </if>
</if> <if test="conditionParamRef.containsKey('visible')">
<if test="conditionParamRef.containsKey('visibleList')"> <if test="conditionParamRef.visible != null ">
${_conditionType_} a.visible in ${_conditionType_} a.visible = #{${_conditionParam_}.visible}
<foreach collection="conditionParamRef.visibleList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('visibleStart') and conditionParamRef.visibleStart != null">
${_conditionType_} a.visible <![CDATA[ >= ]]> #{${_conditionParam_}.visibleStart}
</if> </if>
<if test="conditionParamRef.containsKey('visibleEnd') and conditionParamRef.visibleEnd != null"> <if test="conditionParamRef.visible == null">
${_conditionType_} a.visible <![CDATA[ <= ]]> #{${_conditionParam_}.visibleEnd} ${_conditionType_} a.visible is null
</if> </if>
</if>
<if test="conditionParamRef.containsKey('visibleList')">
${_conditionType_} a.visible in
<foreach collection="conditionParamRef.visibleList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('visibleStart') and conditionParamRef.visibleStart != null">
${_conditionType_} a.visible <![CDATA[ >= ]]> #{${_conditionParam_}.visibleStart}
</if>
<if test="conditionParamRef.containsKey('visibleEnd') and conditionParamRef.visibleEnd != null">
${_conditionType_} a.visible <![CDATA[ <= ]]> #{${_conditionParam_}.visibleEnd}
</if>
<if test="conditionParamRef.containsKey('menuType')"> <if test="conditionParamRef.containsKey('menuType')">
<if test="conditionParamRef.menuType != null "> <if test="conditionParamRef.menuType != null ">
${_conditionType_} a.menuType = #{${_conditionParam_}.menuType} ${_conditionType_} a.menuType = #{${_conditionParam_}.menuType}
</if>
<if test="conditionParamRef.menuType == null">
${_conditionType_} a.menuType is null
</if>
</if>
<if test="conditionParamRef.containsKey('menuTypeList')">
${_conditionType_} a.menuType in
<foreach collection="conditionParamRef.menuTypeList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if> </if>
<if test="conditionParamRef.containsKey('menuTypeStart') and conditionParamRef.menuTypeStart != null"> <if test="conditionParamRef.menuType == null">
${_conditionType_} a.menuType <![CDATA[ >= ]]> #{${_conditionParam_}.menuTypeStart} ${_conditionType_} a.menuType is null
</if>
<if test="conditionParamRef.containsKey('menuTypeEnd') and conditionParamRef.menuTypeEnd != null">
${_conditionType_} a.menuType <![CDATA[ <= ]]> #{${_conditionParam_}.menuTypeEnd}
</if> </if>
</if>
<if test="conditionParamRef.containsKey('menuTypeList')">
${_conditionType_} a.menuType in
<foreach collection="conditionParamRef.menuTypeList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('menuTypeStart') and conditionParamRef.menuTypeStart != null">
${_conditionType_} a.menuType <![CDATA[ >= ]]> #{${_conditionParam_}.menuTypeStart}
</if>
<if test="conditionParamRef.containsKey('menuTypeEnd') and conditionParamRef.menuTypeEnd != null">
${_conditionType_} a.menuType <![CDATA[ <= ]]> #{${_conditionParam_}.menuTypeEnd}
</if>
<if test="conditionParamRef.containsKey('status')"> <if test="conditionParamRef.containsKey('status')">
<if test="conditionParamRef.status != null "> <if test="conditionParamRef.status != null ">
${_conditionType_} a.status = #{${_conditionParam_}.status} ${_conditionType_} a.status = #{${_conditionParam_}.status}
</if>
<if test="conditionParamRef.status == null">
${_conditionType_} a.status is null
</if>
</if>
<if test="conditionParamRef.containsKey('statusList')">
${_conditionType_} a.status in
<foreach collection="conditionParamRef.statusList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('statusStart') and conditionParamRef.statusStart != null">
${_conditionType_} a.status <![CDATA[ >= ]]> #{${_conditionParam_}.statusStart}
</if> </if>
<if test="conditionParamRef.containsKey('statusEnd') and conditionParamRef.statusEnd != null"> <if test="conditionParamRef.status == null">
${_conditionType_} a.status <![CDATA[ <= ]]> #{${_conditionParam_}.statusEnd} ${_conditionType_} a.status is null
</if> </if>
</if>
<if test="conditionParamRef.containsKey('statusList')">
${_conditionType_} a.status in
<foreach collection="conditionParamRef.statusList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('statusStart') and conditionParamRef.statusStart != null">
${_conditionType_} a.status <![CDATA[ >= ]]> #{${_conditionParam_}.statusStart}
</if>
<if test="conditionParamRef.containsKey('statusEnd') and conditionParamRef.statusEnd != null">
${_conditionType_} a.status <![CDATA[ <= ]]> #{${_conditionParam_}.statusEnd}
</if>
<if test="conditionParamRef.containsKey('authType')"> <if test="conditionParamRef.containsKey('authType')">
<if test="conditionParamRef.authType != null "> <if test="conditionParamRef.authType != null ">
${_conditionType_} a.authType = #{${_conditionParam_}.authType} ${_conditionType_} a.authType = #{${_conditionParam_}.authType}
</if>
<if test="conditionParamRef.authType == null">
${_conditionType_} a.authType is null
</if>
</if>
<if test="conditionParamRef.containsKey('authTypeList')">
${_conditionType_} a.authType in
<foreach collection="conditionParamRef.authTypeList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('authTypeStart') and conditionParamRef.authTypeStart != null">
${_conditionType_} a.authType <![CDATA[ >= ]]> #{${_conditionParam_}.authTypeStart}
</if> </if>
<if test="conditionParamRef.containsKey('authTypeEnd') and conditionParamRef.authTypeEnd != null"> <if test="conditionParamRef.authType == null">
${_conditionType_} a.authType <![CDATA[ <= ]]> #{${_conditionParam_}.authTypeEnd} ${_conditionType_} a.authType is null
</if> </if>
</if>
<if test="conditionParamRef.containsKey('authTypeList')">
${_conditionType_} a.authType in
<foreach collection="conditionParamRef.authTypeList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('authTypeStart') and conditionParamRef.authTypeStart != null">
${_conditionType_} a.authType <![CDATA[ >= ]]> #{${_conditionParam_}.authTypeStart}
</if>
<if test="conditionParamRef.containsKey('authTypeEnd') and conditionParamRef.authTypeEnd != null">
${_conditionType_} a.authType <![CDATA[ <= ]]> #{${_conditionParam_}.authTypeEnd}
</if>
<if test="conditionParamRef.containsKey('orderId')"> <if test="conditionParamRef.containsKey('orderId')">
<if test="conditionParamRef.orderId != null "> <if test="conditionParamRef.orderId != null ">
${_conditionType_} a.orderId = #{${_conditionParam_}.orderId} ${_conditionType_} a.orderId = #{${_conditionParam_}.orderId}
</if>
<if test="conditionParamRef.orderId == null">
${_conditionType_} a.orderId is null
</if>
</if>
<if test="conditionParamRef.containsKey('orderIdList')">
${_conditionType_} a.orderId in
<foreach collection="conditionParamRef.orderIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('orderIdStart') and conditionParamRef.orderIdStart != null">
${_conditionType_} a.orderId <![CDATA[ >= ]]> #{${_conditionParam_}.orderIdStart}
</if> </if>
<if test="conditionParamRef.containsKey('orderIdEnd') and conditionParamRef.orderIdEnd != null"> <if test="conditionParamRef.orderId == null">
${_conditionType_} a.orderId <![CDATA[ <= ]]> #{${_conditionParam_}.orderIdEnd} ${_conditionType_} a.orderId is null
</if> </if>
</if>
<if test="conditionParamRef.containsKey('orderIdList')">
${_conditionType_} a.orderId in
<foreach collection="conditionParamRef.orderIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('orderIdStart') and conditionParamRef.orderIdStart != null">
${_conditionType_} a.orderId <![CDATA[ >= ]]> #{${_conditionParam_}.orderIdStart}
</if>
<if test="conditionParamRef.containsKey('orderIdEnd') and conditionParamRef.orderIdEnd != null">
${_conditionType_} a.orderId <![CDATA[ <= ]]> #{${_conditionParam_}.orderIdEnd}
</if>
<if test="conditionParamRef.containsKey('createTime')"> <if test="conditionParamRef.containsKey('createTime')">
<if test="conditionParamRef.createTime != null "> <if test="conditionParamRef.createTime != null ">
${_conditionType_} a.createTime = #{${_conditionParam_}.createTime} ${_conditionType_} a.createTime = #{${_conditionParam_}.createTime}
</if>
<if test="conditionParamRef.createTime == null">
${_conditionType_} a.createTime is null
</if>
</if> </if>
<if test="conditionParamRef.containsKey('createTimeStart') and conditionParamRef.createTimeStart != null and conditionParamRef.createTimeStart!=''"> <if test="conditionParamRef.createTime == null">
${_conditionType_} a.createTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') ${_conditionType_} a.createTime is null
</if> </if>
<if test="conditionParamRef.containsKey('createTimeEnd') and conditionParamRef.createTimeEnd != null and conditionParamRef.createTimeEnd!=''"> </if>
${_conditionType_} a.createTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') <if test="conditionParamRef.containsKey('createTimeStart') and conditionParamRef.createTimeStart != null and conditionParamRef.createTimeStart!=''">
${_conditionType_} a.createTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
</if>
<if test="conditionParamRef.containsKey('createTimeEnd') and conditionParamRef.createTimeEnd != null and conditionParamRef.createTimeEnd!=''">
${_conditionType_} a.createTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
</if>
<if test="conditionParamRef.containsKey('createUserId')">
<if test="conditionParamRef.createUserId != null ">
${_conditionType_} a.createUserId = #{${_conditionParam_}.createUserId}
</if> </if>
<if test="conditionParamRef.containsKey('createUserId')"> <if test="conditionParamRef.createUserId == null">
<if test="conditionParamRef.createUserId != null "> ${_conditionType_} a.createUserId is null
${_conditionType_} a.createUserId = #{${_conditionParam_}.createUserId}
</if>
<if test="conditionParamRef.createUserId == null">
${_conditionType_} a.createUserId is null
</if>
</if> </if>
<if test="conditionParamRef.containsKey('createUserIdList')"> </if>
${_conditionType_} a.createUserId in <if test="conditionParamRef.containsKey('createUserIdList')">
<foreach collection="conditionParamRef.createUserIdList" open="(" close=")" index="index" item="item" separator=","> ${_conditionType_} a.createUserId in
#{item} <foreach collection="conditionParamRef.createUserIdList" open="(" close=")" index="index" item="item" separator=",">
</foreach> #{item}
</if> </foreach>
<if test="conditionParamRef.containsKey('createUserIdStart') and conditionParamRef.createUserIdStart != null"> </if>
${_conditionType_} a.createUserId <![CDATA[ >= ]]> #{${_conditionParam_}.createUserIdStart} <if test="conditionParamRef.containsKey('createUserIdStart') and conditionParamRef.createUserIdStart != null">
${_conditionType_} a.createUserId <![CDATA[ >= ]]> #{${_conditionParam_}.createUserIdStart}
</if>
<if test="conditionParamRef.containsKey('createUserIdEnd') and conditionParamRef.createUserIdEnd != null">
${_conditionType_} a.createUserId <![CDATA[ <= ]]> #{${_conditionParam_}.createUserIdEnd}
</if>
<if test="conditionParamRef.containsKey('createUserName')">
<if test="conditionParamRef.createUserName != null and conditionParamRef.createUserName != ''">
${_conditionType_} a.createUserName like #{${_conditionParam_}.createUserName}
</if> </if>
<if test="conditionParamRef.containsKey('createUserIdEnd') and conditionParamRef.createUserIdEnd != null"> <if test="conditionParamRef.createUserName == null">
${_conditionType_} a.createUserId <![CDATA[ <= ]]> #{${_conditionParam_}.createUserIdEnd} ${_conditionType_} a.createUserName is null
</if> </if>
</if>
<if test="conditionParamRef.containsKey('createUserNameList')">
${_conditionType_} a.createUserName in
<foreach collection="conditionParamRef.createUserNameList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('remark')">
<if test="conditionParamRef.containsKey('createUserName')"> <if test="conditionParamRef.remark != null and conditionParamRef.remark != ''">
<if test="conditionParamRef.createUserName != null and conditionParamRef.createUserName != ''"> ${_conditionType_} a.remark like #{${_conditionParam_}.remark}
${_conditionType_} a.createUserName like #{${_conditionParam_}.createUserName}
</if>
<if test="conditionParamRef.createUserName == null">
${_conditionType_} a.createUserName is null
</if>
</if> </if>
<if test="conditionParamRef.containsKey('createUserNameList')"> <if test="conditionParamRef.remark == null">
${_conditionType_} a.createUserName in ${_conditionType_} a.remark is null
<foreach collection="conditionParamRef.createUserNameList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if> </if>
</if>
<if test="conditionParamRef.containsKey('remarkList')">
${_conditionType_} a.remark in
<foreach collection="conditionParamRef.remarkList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
</sql> </sql>
<sql id="_orderCols_"> <sql id="_orderCols_">
<if test="orderColList != null and !orderColList.isEmpty()"> <if test="orderColList != null and !orderColList.isEmpty()">
order by order by
<trim suffixOverrides="," suffix=""> <trim suffixOverrides="," suffix="">
<foreach collection="orderColList" open="" close="" index="index" item="item" separator=","> <foreach collection="orderColList" open="" close="" index="index" item="item" separator=",">
${item.colName} ${item.sortKind} ${item.colName} ${item.sortKind}
</foreach> </foreach>
</trim> </trim>
</if> </if>
<if test="(orderColList == null or orderColList.isEmpty()) and orderCol != null and !orderCol.isEmpty()"> <if test="(orderColList == null or orderColList.isEmpty()) and orderCol != null and !orderCol.isEmpty()">
order by order by
<trim suffixOverrides="," suffix=""> <trim suffixOverrides="," suffix="">
<if test="orderCol.containsKey('id')"> <if test="orderCol.containsKey('id')">
a.id a.id
<if test='orderCol.id != null and "DESC".equalsIgnoreCase(orderCol.id)'>DESC</if> <if test='orderCol.id != null and "DESC".equalsIgnoreCase(orderCol.id)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('name')"> <if test="orderCol.containsKey('name')">
a.name a.name
<if test='orderCol.name != null and "DESC".equalsIgnoreCase(orderCol.name)'>DESC</if> <if test='orderCol.name != null and "DESC".equalsIgnoreCase(orderCol.name)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('url')"> <if test="orderCol.containsKey('url')">
a.url a.url
<if test='orderCol.url != null and "DESC".equalsIgnoreCase(orderCol.url)'>DESC</if> <if test='orderCol.url != null and "DESC".equalsIgnoreCase(orderCol.url)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('parentId')"> <if test="orderCol.containsKey('parentId')">
a.parentId a.parentId
<if test='orderCol.parentId != null and "DESC".equalsIgnoreCase(orderCol.parentId)'>DESC</if> <if test='orderCol.parentId != null and "DESC".equalsIgnoreCase(orderCol.parentId)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('linkType')"> <if test="orderCol.containsKey('linkType')">
a.linkType a.linkType
<if test='orderCol.linkType != null and "DESC".equalsIgnoreCase(orderCol.linkType)'>DESC</if> <if test='orderCol.linkType != null and "DESC".equalsIgnoreCase(orderCol.linkType)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('imgPath')"> <if test="orderCol.containsKey('imgPath')">
a.imgPath a.imgPath
<if test='orderCol.imgPath != null and "DESC".equalsIgnoreCase(orderCol.imgPath)'>DESC</if> <if test='orderCol.imgPath != null and "DESC".equalsIgnoreCase(orderCol.imgPath)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('buttonImgPath')"> <if test="orderCol.containsKey('buttonImgPath')">
a.buttonImgPath a.buttonImgPath
<if test='orderCol.buttonImgPath != null and "DESC".equalsIgnoreCase(orderCol.buttonImgPath)'>DESC</if> <if test='orderCol.buttonImgPath != null and "DESC".equalsIgnoreCase(orderCol.buttonImgPath)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('imgCommPath')"> <if test="orderCol.containsKey('imgCommPath')">
a.imgCommPath a.imgCommPath
<if test='orderCol.imgCommPath != null and "DESC".equalsIgnoreCase(orderCol.imgCommPath)'>DESC</if> <if test='orderCol.imgCommPath != null and "DESC".equalsIgnoreCase(orderCol.imgCommPath)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('visible')"> <if test="orderCol.containsKey('visible')">
a.visible a.visible
<if test='orderCol.visible != null and "DESC".equalsIgnoreCase(orderCol.visible)'>DESC</if> <if test='orderCol.visible != null and "DESC".equalsIgnoreCase(orderCol.visible)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('menuType')"> <if test="orderCol.containsKey('menuType')">
a.menuType a.menuType
<if test='orderCol.menuType != null and "DESC".equalsIgnoreCase(orderCol.menuType)'>DESC</if> <if test='orderCol.menuType != null and "DESC".equalsIgnoreCase(orderCol.menuType)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('status')"> <if test="orderCol.containsKey('status')">
a.status a.status
<if test='orderCol.status != null and "DESC".equalsIgnoreCase(orderCol.status)'>DESC</if> <if test='orderCol.status != null and "DESC".equalsIgnoreCase(orderCol.status)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('authType')"> <if test="orderCol.containsKey('authType')">
a.authType a.authType
<if test='orderCol.authType != null and "DESC".equalsIgnoreCase(orderCol.authType)'>DESC</if> <if test='orderCol.authType != null and "DESC".equalsIgnoreCase(orderCol.authType)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('orderId')"> <if test="orderCol.containsKey('orderId')">
a.orderId a.orderId
<if test='orderCol.orderId != null and "DESC".equalsIgnoreCase(orderCol.orderId)'>DESC</if> <if test='orderCol.orderId != null and "DESC".equalsIgnoreCase(orderCol.orderId)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('createTime')"> <if test="orderCol.containsKey('createTime')">
a.createTime a.createTime
<if test='orderCol.createTime != null and "DESC".equalsIgnoreCase(orderCol.createTime)'>DESC</if> <if test='orderCol.createTime != null and "DESC".equalsIgnoreCase(orderCol.createTime)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('createUserId')"> <if test="orderCol.containsKey('createUserId')">
a.createUserId a.createUserId
<if test='orderCol.createUserId != null and "DESC".equalsIgnoreCase(orderCol.createUserId)'>DESC</if> <if test='orderCol.createUserId != null and "DESC".equalsIgnoreCase(orderCol.createUserId)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('createUserName')"> <if test="orderCol.containsKey('createUserName')">
a.createUserName a.createUserName
<if test='orderCol.createUserName != null and "DESC".equalsIgnoreCase(orderCol.createUserName)'>DESC</if> <if test='orderCol.createUserName != null and "DESC".equalsIgnoreCase(orderCol.createUserName)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('remark')">
a.remark
<if test='orderCol.remark != null and "DESC".equalsIgnoreCase(orderCol.remark)'>DESC</if>
,
</if>
</trim> </trim>
</if> </if>
</sql> </sql>
......
portal-manager/src/main/resources/sqlmap/module/menu/menuExt.xml
View file @ 28fd9ccd
...@@ -15,12 +15,16 @@ ...@@ -15,12 +15,16 @@
<select id="selectMenuTreeByUserId" parameterType="paramDto" resultMap="MenuEntity-Map"> <select id="selectMenuTreeByUserId" parameterType="paramDto" resultMap="MenuEntity-Map">
select <include refid="_columns"/> select <include refid="_columns"/>
from mortals_xhx_menu a FROM (
left join mortals_xhx_role_auth rm on a.id = rm.menuId SELECT m.*
left join mortals_xhx_role_user ur on rm.roleId = ur.roleId from mortals_xhx_menu m
left join mortals_xhx_role ro on ur.roleId = ro.id left join mortals_xhx_role_auth rm on m.id = rm.menuId
left join mortals_xhx_user u on ur.userId = u.id left join mortals_xhx_role_user ur on rm.roleId = ur.roleId
where u.id = #{condition.userId} and a.menuType in ('0','1','2') and a.status = 1 AND ro.status = 1 left join mortals_xhx_role ro on ur.roleId = ro.id
where ur.userId = #{condition.userId} and m.menuType in ('0','1','2') and m.status = 1
UNION
SELECT * from mortals_xhx_menu where parentId =-1
) a
order by a.parentId, a.orderId order by a.parentId, a.orderId
</select> </select>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment