productDev/yunyibao.git

			@@ -16,7 +16,7 @@
			</resultMap>
			<select id="selectManageList" resultMap="SystemPermissionListVO">
			SELECT
			perm.`ID`, perm.`type`, perm.`CODE`, perm.`NAME`, perm.`REMARK`, perm.`FIXED`, perm.`CREATE_TIME`, perm.`UPDATE_TIME`, perm.`CREATE_USER`, perm.`UPDATE_USER`, perm.`DELETED`,
			perm.*,
			create_user.ID CREATE_USER_ID, create_user.`USERNAME` CREATE_USER_NAME,
			update_user.ID UPDETE_USER_ID, update_user.`USERNAME` UPDATE_USER_NAME
			FROM SYSTEM_PERMISSION perm
			@@ -30,6 +30,15 @@
			<if test="dto.type != null">
			AND ifnull(perm.type,0) in(0, ${dto.type})
			</if>
			<if test="dto.iscom != null">
			AND ifnull(perm.iscom,0) =${dto.iscom}
			</if>
			<if test="dto.isshop != null">
			AND ifnull(perm.isshop,0)=${dto.isshop}
			</if>
			<if test="dto.isadmin != null">
			AND ifnull(perm.isadmin,0) = ${dto.isadmin}
			</if>
			<if test="dto.name != null and dto.name!=''">
			AND perm.`NAME` LIKE CONCAT('%', #{dto.name}, '%')
			</if>
			@@ -40,7 +49,7 @@
			<!-- 根据用户ID查询权限 -->
			<select id="selectByUserId" parameterType="java.lang.Integer" resultType="com.doumee.dao.system.model.SystemPermission">
			SELECT
			perm.`ID`, perm.`CODE`, perm.`NAME`, perm.`REMARK`, perm.`CREATE_TIME`, perm.`UPDATE_TIME`, perm.`CREATE_USER`, perm.`UPDATE_USER`, perm.`DELETED`
			perm.*
			FROM SYSTEM_PERMISSION perm
			INNER JOIN SYSTEM_ROLE_PERMISSION role_perm ON role_perm.PERMISSION_ID = perm.ID AND role_perm.DELETED = 0
			INNER JOIN SYSTEM_ROLE role ON role.ID = role_perm.ROLE_ID AND role.DELETED = 0
			@@ -54,7 +63,7 @@
			<!-- 根据角色ID查询权限 -->
			<select id="selectByRoleId" parameterType="java.lang.Integer" resultType="com.doumee.dao.system.model.SystemPermission">
			SELECT
			perm.`ID`, perm.`CODE`, perm.`NAME`, perm.`REMARK`, perm.`CREATE_TIME`, perm.`UPDATE_TIME`, perm.`CREATE_USER`, perm.`UPDATE_USER`, perm.`DELETED`
			perm.*
			FROM SYSTEM_PERMISSION perm
			INNER JOIN SYSTEM_ROLE_PERMISSION role_perm ON role_perm.PERMISSION_ID = perm.ID AND role_perm.DELETED = 0
			<where>