Преглед изворни кода

Merge remote-tracking branch 'origin/master'

zhaoxian пре 2 година
родитељ
комит
8d215fdfb3

+ 2 - 2
ruixuan-live/src/main/java/com/ruixuan/isc/controller/KuaishouItemCollectSamplesController.java

@@ -103,10 +103,10 @@ public class KuaishouItemCollectSamplesController extends BaseController {
                         requestMap.put("itemCreateId", userId);
                     }
                 } else {
-                    if (roleId.equals("courtshipManager")) { // 经理层级查看部门下所有数据
+                    if (roleId.equals("courtshipManager")  || roleId.equals("bdManager") ) { // 经理层级查看部门下所有数据
                         Long deptId = sysDeptService.getDeptIdByUserId(userId);
                         List<Long> userIds = sysDeptService.getDeptUserListByDeptId(deptId);
-                        if (roleId.equals("bdManager") || roleId.equals("associationManager")) {
+                        if (roleId.equals("bdManager") ) {
                             requestMap.put("collectSampleIds", userIds);
                         } else {
                             requestMap.put("itemCreateIds", userIds);

+ 3 - 0
ruixuan-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -94,6 +94,9 @@
         <if test="userName != null and userName != ''">
             AND u.user_name like concat('%', #{userName}, '%')
         </if>
+        <if test="nickName != null and nickName != ''">
+            AND u.nick_name like concat('%', #{nickName}, '%')
+        </if>
         <if test="status != null and status != ''">
             AND u.status = #{status}
         </if>