~jiangyouyao/beauty-erp.git

			@@ -56,6 +56,7 @@
			<result property="signOrder" column="SIGN_ORDER"/>
			<result property="signDate" column="SIGN_DATE"/>
			<result property="salarGrad" column="salarGrad"/>
			<result property="allCustomer" column="allCustomer"/>

			<!-- 扩展属性 -->
			<result property="shopName" column="SHOP_NAME"/>
			@@ -323,7 +324,7 @@
			<set>
			update_time=now(),
			<if test="updateBy!=null">
			update_by = #{btnKey},
			update_by = #{updateBy},
			</if>
			<if
			test="(suName!=null and suName!='') or (suName!='' and suName==0)">
			@@ -496,19 +497,19 @@
			</update>

			<!-- 批量删除 -->
			<delete id="deleteByIds" parameterType="java.util.List">
			delete from sys_users where su_id in
			<update id="deleteByIds" parameterType="java.util.List">
			update sys_users set su_valid='N' where su_id in
			<foreach collection="list" index="index" item="item" open="("
			separator="," close=")">
			#{item}
			</foreach>
			</delete>
			</update>

			<!-- 根据id删除 -->
			<delete id="deleteById" parameterType="Long">
			DELETE FROM sys_users
			where su_id=#{suId}
			</delete>
			<update id="deleteById" parameterType="Long">
			update sys_users set su_valid='N'
			where su_id=#{suId}
			</update>

			<!-- 根据对象删除 -->
			<delete id="deleteByModel" parameterType="Long">
			@@ -655,6 +656,8 @@
			select *,
			(SELECT IF(COUNT(1)>0,'Y','N') FROM sys_role a WHERE FIND_IN_SET(a.role_id,role_ids) AND role_remark ='是')
			shopRole,
			(SELECT IF(COUNT(1)>0,'Y','N') FROM sys_role a WHERE FIND_IN_SET(a.role_id,role_ids) AND customer ='是')
			allCustomer,
			(select GROUP_CONCAT(role_name separator ',') from sys_role where find_in_set(role_id,role_ids) ) roleName,
			(select com_name from sys_company where com_id=company_id) as company_name,
			(select shop_name from sys_shop_info where shop_id=id) as SHOP_NAME
			@@ -937,6 +940,8 @@
			<select id="selectById" resultMap="SysUsersMap">
			select *,
			(SELECT IF(COUNT(1)>0,'Y','N') FROM sys_role a WHERE FIND_IN_SET(a.role_id,role_ids) AND role_remark ='是') shopRole,
			(SELECT IF(COUNT(1)>0,'Y','N') FROM sys_role a WHERE FIND_IN_SET(a.role_id,role_ids) AND customer ='是')
			allCustomer,
			(select GROUP_CONCAT(role_name separator ',') from sys_role where find_in_set(role_id,role_ids) ) roleName,
			role_ids
			from sys_users
			@@ -949,6 +954,8 @@
			select *,
			(SELECT IF(COUNT(1)>0,'Y','N') FROM sys_role a WHERE FIND_IN_SET(a.role_id,role_ids) AND role_remark ='是')
			shopRole,
			(SELECT IF(COUNT(1)>0,'Y','N') FROM sys_role a WHERE FIND_IN_SET(a.role_id,role_ids) AND customer ='是')
			allCustomer,
			(select GROUP_CONCAT(role_name separator ',') from sys_role where find_in_set(role_id,role_ids) ) roleName,
			role_ids
			from sys_users
			@@ -960,7 +967,7 @@
			</if>
			<if
			test="(record.suName!=null and record.suName!='') or (record.suName!='' and record.suName==0)">
			and su_name like concat('%',#{record.suName},'%')
			and (su_name like concat('%',concat(#{record.suName},'%')) or su_tel = #{record.suName})
			</if>
			<if
			test="(record.suTel!=null and record.suTel!='') or (record.suTel!='' and record.suTel==0)">
			@@ -1273,7 +1280,7 @@
			<select id="selectByRoleName" resultMap="SysUsersMap">

			SELECT
			a.*
			distinct a.*
			FROM
			sys_users a
			LEFT JOIN sys_role r ON FIND_IN_SET(r.role_id, a.role_ids)
			@@ -1290,7 +1297,6 @@
			<if test="users.shopId !=null and users.shopId !=''">
			AND a.SHOP_ID = #{users.shopId}
			</if>

			ORDER BY
			a.SIGN_ORDER IS NULL,
			a.SIGN_ORDER
			@@ -1319,5 +1325,7 @@
			where id=#{id}
			</update>


			<select id="selectAppVersion" resultType="com.matrix.system.hive.bean.AppVersion">
			select * from app_version
			</select>
			</mapper>