Merge branch 'meiteng' of ssh://103.249.252.28:10022/lcy/education into meiteng

src/main/java/org/rcisoft/business/bchapter/service/impl/BChapterServiceImpl.java

@@ -182,7 +182,6 @@ public class BChapterServiceImpl implements BChapterService {
         model.setPid(chapterDTO.getPid());
         model.setChapterLevel(chapterDTO.getChapterLevel());
 
-
 //        if ("2".equals(dto.getType())||"4".equals(dto.getType())){
 //            mtCotactApiRequestClient.fileChange(dto);
 //        }
@@ -208,6 +207,8 @@ public class BChapterServiceImpl implements BChapterService {
 
             if (model.getChapterLevel() == 1) {
 
+                chapterDTO.setBusinessId(model.getBusinessId());
+                chapterDTO.setPid(model.getPid());
                 //添加章
                 line = bChapterRepository.insertSelective(model);
             } else {

src/main/java/org/rcisoft/sys/user/dao/SysUserMapper.java

@@ -24,7 +24,6 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
             "LEFT JOIN s_r_user_role AS ru ON su.business_id = ru.user_id " +
             "LEFT JOIN tm_admin_role AS sr ON sr.r_id = ru.role_id " +
             "WHERE su.del_flag = 0 " +
-            "and sr.r_status != 0 " +
 
             "and su.corp_id = #{corpId} " +
 

src/main/java/org/rcisoft/sys/user/service/impl/SysUserServiceImpl.java

@@ -89,7 +89,7 @@ public class SysUserServiceImpl implements SysUserService {
             }
         }
         //部门不为空时 部门条件过滤
-        if (dto.getDept() != null || !"".equals(dto.getDept())) {
+        if (dto.getDept() != null ) {
             List<SysUser> usersForDept = new ArrayList<>();
             for (SysUser user : users) {
                 if (user.getDepart().equals(dto.getDept())) {