基础信息接口

sql/edu_update.sql

@@ -12,6 +12,13 @@ ALTER TABLE `b_class`
 ALTER TABLE `b_class`
   ADD COLUMN `grade_code`  varchar(10) CHARACTER SET utf8 COLLATE utf8_general_ci NULL
   COMMENT '所属年级code' AFTER `type`;
+
+/**
+班级表b_class新建字段“agency_code”,所属教学单位
+ */
+ALTER TABLE `b_class`
+  ADD COLUMN `agency_code`  varchar(10) CHARACTER SET utf8 COLLATE utf8_general_ci NULL
+  COMMENT '教学单位' AFTER `grade_code`;
 /*
 新建作息时间表b_course_code（商务应该只有上下午课，没有晚上课）
     sql文件位置：sql>new_table>2.0.3>b_course_code.sql
@@ -40,5 +47,10 @@ ALTER TABLE `b_student`
  */
 ALTER TABLE `s_user`
   ADD COLUMN `agency_code`  varchar(8) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '所属教学单位' AFTER `git_lab_impression_token`;
+/*
+用户表新建“is_created”字段，是否是创建的用户,0否1是
+ */
+ALTER TABLE `s_user`
+  ADD COLUMN `is_created`  varchar(1) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT 0 COMMENT '是否是创建的用户（企业教学负责人等）0否1是' AFTER `agency_code`;
 
 

src/main/java/org/rcisoft/business/bagency/controller/BAgencyController.java

@@ -25,7 +25,7 @@ import javax.validation.Valid;
 * Created by  on 2018-4-4 8:57:37.
 */
 @RestController
-@RequestMapping("/bagency")
+@RequestMapping("/bAgency")
 public class BAgencyController extends PaginationController<BAgency> {
 
     @Autowired

src/main/java/org/rcisoft/business/bagency/entity/BAgency.java

@@ -35,5 +35,9 @@ public class BAgency  extends IdEntity<BAgency> {
 
     @Transient
     private String termCode;
+
+    public BAgency(String code) {
+        this.code = code;
+    }
 }
 

src/main/java/org/rcisoft/business/bagency/service/impl/BAgencyServiceImpl.java

@@ -5,7 +5,9 @@ import org.rcisoft.business.bagency.dao.BAgencyRepository;
 import org.rcisoft.business.bagency.entity.BAgency;
 import org.rcisoft.business.bagency.service.BAgencyService;
 import org.rcisoft.core.aop.PageUtil;
+import org.rcisoft.core.exception.ServiceException;
 import org.rcisoft.core.model.PersistModel;
+import org.rcisoft.core.result.ResultServiceEnums;
 import org.rcisoft.core.util.UserUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -35,7 +37,10 @@ public class BAgencyServiceImpl implements BAgencyService {
     @Transactional(propagation = Propagation.REQUIRED,isolation = Isolation.DEFAULT)
     @Override
     public PersistModel save(BAgency bAgency){
-        bAgency.setCommonBusinessId();
+        BAgency agency = new BAgency(bAgency.getCode());
+        if(bAgencyRepository.selectOne(agency)!=null){
+            throw new ServiceException(ResultServiceEnums.CODE_IS_EXISTS);
+        };
         //增加操作
         UserUtil.setCurrentPersistOperation(bAgency);
         int line = bAgencyRepository.insertSelective(bAgency);
@@ -68,6 +73,10 @@ public class BAgencyServiceImpl implements BAgencyService {
     @Transactional(propagation = Propagation.REQUIRED,isolation = Isolation.DEFAULT)
     @Override
     public PersistModel merge(BAgency bAgency){
+        /*BAgency agency = new BAgency(bAgency.getName());
+        if(bAgencyRepository.selectOne(agency)!=null){
+            throw new ServiceException(ResultServiceEnums.CODE_IS_EXISTS);
+        };*/
         UserUtil.setCurrentMergeOperation(bAgency);
         int line = bAgencyRepository.updateByPrimaryKeySelective(bAgency);
         log.info(UserUtil.getUserInfoProp(bAgency.getToken(), UserUtil.USER_USERNAME)+"修改了ID为"+

src/main/java/org/rcisoft/business/bclass/controller/BClassController.java

@@ -45,7 +45,9 @@ public class BClassController extends PaginationController<BClass> {
             @ApiImplicitParam(name = "code", value = "班级编号(1-50)", required = true, dataType = "varchar"),
             @ApiImplicitParam(name = "className", value = "班级名称(1-150)", required = true, dataType = "varchar"),
             @ApiImplicitParam(name = "studentNum", value = "学生数量(1-3)", required = false, dataType = "varchar"),
-            @ApiImplicitParam(name = "gradeCode", value = "年级", required = true, dataType = "varchar")})
+            @ApiImplicitParam(name = "gradeCode", value = "年级", required = true, dataType = "varchar"),
+            @ApiImplicitParam(name = "agencyCode", value = "所属教学单位", required = false, dataType = "varchar"),
+            @ApiImplicitParam(name = "type", value = "班级类型", required = true, dataType = "varchar")})
     @PreAuthorize("hasRole('ROLE_1001')")
     @PostMapping(value = "/add")
     public Result add(@Valid BClass bClass, BindingResult bindingResult) {
@@ -99,7 +101,8 @@ public class BClassController extends PaginationController<BClass> {
             @ApiImplicitParam(name = "code", value = "班级编号", required = false, dataType = "varchar"),
             @ApiImplicitParam(name = "className", value = "班级名称", required = false, dataType = "varchar"),
             @ApiImplicitParam(name = "studentNum", value = "学生数量", required = false, dataType = "varchar"),
-            @ApiImplicitParam(name = "remarks", value = "备注", required = false, dataType = "varchar")})
+            @ApiImplicitParam(name = "remarks", value = "备注", required = false, dataType = "varchar"),
+            @ApiImplicitParam(name = "type", value = "班级类型  0行政班，1企业班", required = true, dataType = "varchar")})
     @GetMapping(value = "/queryBClasssByPagination")
     public GridModel queryBClasssByPagination(BClass param) {
         param.setCreateBy(UserUtil.getUserInfoProp(getToken(),UserUtil.USER_ID));

src/main/java/org/rcisoft/business/bclass/dao/BClassRepository.java

@@ -46,5 +46,8 @@ public interface BClassRepository extends BaseMapper<BClass> {
     @Select("select * from b_class where del_flag != 1 and flag = 1")
     @ResultMap(value = "BaseResultMap" )
     List<BClass> queryBClassList();
+
+    @Select("select class_name from b_class where find_in_set(code,#{classesCode}) and del_flag != 1 and flag = 1")
+    List<String> queryClassNamesByIds(String classesCode);
 }
 

src/main/java/org/rcisoft/business/bclass/entity/BClass.java

@@ -9,6 +9,7 @@ import org.rcisoft.core.entity.IdEntity;
 
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 
 /**
 * Created with CodeGenerator on 2017/07/12.
@@ -45,6 +46,17 @@ public class BClass extends IdEntity<BClass> {
     /*年级*/
     private String gradeCode;
 
+    /*年级名称*/
+    @Transient
+    private String gradeName;
+
+    /*教学单位code*/
+    private String agencyCode;
+
+    /*教学单位名称*/
+    @Transient
+    private String agencyName;
+
     public BClass(String code) {
         this.code = code;
     }

src/main/java/org/rcisoft/business/beduclass/controller/BEduClassController.java

@@ -42,7 +42,7 @@ public class BEduClassController extends PaginationController<BEduClass> {
             @ApiImplicitParam(name = "className", value = "教学班名 length(1~150)", required = true, dataType = "varchar"),
             @ApiImplicitParam(name = "agencyId", value = "企业ID", required = false, dataType = "varchar"),
             @ApiImplicitParam(name = "type", value = "班级类型", required = false, dataType = "varchar"),
-            @ApiImplicitParam(name = "classedId", value = "教学班ID串", required = false, dataType = "varchar")})
+            @ApiImplicitParam(name = "classesCode", value = "教学班code串", required = false, dataType = "varchar")})
     @PostMapping(value = "/add")
     @PreAuthorize("hasRole('ROLE_1001')")
     public Result add(BEduClass bEduClass) {
@@ -75,7 +75,7 @@ public class BEduClassController extends PaginationController<BEduClass> {
             @ApiImplicitParam(name = "className", value = "教学班名 length(1~150)", required = false, dataType = "varchar"),
             @ApiImplicitParam(name = "agencyId", value = "企业ID", required = false, dataType = "varchar"),
             @ApiImplicitParam(name = "type", value = "班级类型 length(1)", required = false, dataType = "varchar"),
-            @ApiImplicitParam(name = "classedId", value = "教学班ID串 length(1~150)", required = false, dataType = "varchar")})
+            @ApiImplicitParam(name = "classedCode", value = "教学班code串 length(1~150)", required = false, dataType = "varchar")})
     @PostMapping("/update")
     @PreAuthorize("hasRole('ROLE_1001')")
     public Result update(BEduClass bEduClass) {
@@ -109,4 +109,7 @@ public class BEduClassController extends PaginationController<BEduClass> {
         bEduClassServiceImpl.findAllByPagination(getPaginationUtility(), bEduClass);
         return getGridModelResponse();
     }
+
+
+
 }

src/main/java/org/rcisoft/business/beduclass/dao/BEduClassRepository.java

@@ -19,11 +19,22 @@ public interface BEduClassRepository extends BaseMapper<BEduClass> {
     * 分页查询 bEduClass
     *
     */
-    @Select("<script>select * from b_edu_class where 1=1 "
+    @Select("<script>select ec.*,bg.`name` as gradeName from b_edu_class ec " +
+            "LEFT JOIN b_grade bg on ec.grade_id = bg.`code` " +
+            " where 1=1  "
+            + "<if test=\"delFlag !=null and delFlag != '' \">and ec.del_flag = #{delFlag} </if> "
+            + "<if test=\"flag !=null and flag != '' \">and ec.flag = #{flag} </if> "
+            + "</script>")
+    @ResultMap(value = "BaseResultMap" )
+    List<BEduClass> queryBEduClasss(BEduClass bEduClass);
+
+    @Select("<script>select ec.*,bg.`name` as gradeName from b_edu_class ec\n" +
+            "LEFT JOIN b_grade bg ON ec.grade_id = bg.`code`\n" +
+            "where 1=1 "
             + "<if test=\"delFlag !=null and delFlag != '' \">and del_flag = #{delFlag} </if> "
             + "<if test=\"flag !=null and flag != '' \">and flag = #{flag} </if> "
             + "</script>")
     @ResultMap(value = "BaseResultMap" )
-    List<BEduClass> queryBEduClasss(BEduClass bEduClass);
+    BEduClass selectDetalInfo(String id);
 }
 

src/main/java/org/rcisoft/business/beduclass/entity/BEduClass.java

@@ -41,10 +41,16 @@ public class BEduClass  extends IdEntity<BEduClass> {
      private String type;
 
      /*子班级ID串*/
-     private String classesId;
+     private String classesCode;
 
      /*学年ID*/
      private String gradeId;
 
+     @Transient
+     private String classNames;
+
+     @Transient
+     private String gradeName;
+
 }
 

src/main/java/org/rcisoft/business/beduclass/service/impl/BEduClassServiceImpl.java

 package org.rcisoft.business.beduclass.service.impl;
 
+import org.rcisoft.business.bclass.dao.BClassRepository;
 import org.rcisoft.core.util.UserUtil;
 import org.rcisoft.core.aop.PageUtil;
 import org.rcisoft.core.model.PersistModel;
@@ -29,6 +30,9 @@ public class BEduClassServiceImpl implements BEduClassService {
     @Autowired
     private BEduClassRepository bEduClassRepository;
 
+    @Autowired
+    private BClassRepository bClassRepository;
+
 
     /**
     * 保存 bEduClass
@@ -84,9 +88,17 @@ public class BEduClassServiceImpl implements BEduClassService {
     * @return
     */
     public BEduClass findById(String id){
-        return bEduClassRepository.selectByPrimaryKey(id);
+        BEduClass eduClass = bEduClassRepository.selectDetalInfo(id);
+        String classNames = this.getclassNames(eduClass.getClassesCode());
+        if(classNames.length()>0){
+            eduClass.setClassNames(classNames.substring(0,classNames.length()-1));
+        }else{
+            eduClass.setClassNames(classNames);
+        }
+        return eduClass;
     }
 
+
     /**
     * 分页查询 bEduClass
     * @param bEduClass
@@ -95,7 +107,26 @@ public class BEduClassServiceImpl implements BEduClassService {
     public List<BEduClass> findAllByPagination(PageUtil<BEduClass> paginationUtility, BEduClass bEduClass){
         bEduClass.setStart();
         bEduClass.setNotDeleted();
-        return bEduClassRepository.queryBEduClasss(bEduClass);
+        List<BEduClass> eduClasses = bEduClassRepository.queryBEduClasss(bEduClass);
+        for(BEduClass eduClass : eduClasses){
+            String name = this.getclassNames(eduClass.getClassesCode());
+            if(name.length()>0){
+                eduClass.setClassNames(name.substring(0,name.length()-1));
+            }else{
+                eduClass.setClassNames(name);
+            }
+        }
+        return eduClasses;
+    }
+
+
+    private String getclassNames(String classesCode) {
+        String name = "";
+        List<String> classNames = bClassRepository.queryClassNamesByIds(classesCode);
+        for(String className : classNames){
+            name += className + ",";
+        }
+        return name;
     }
 
 }

src/main/java/org/rcisoft/business/bstudent/controller/BStudentController.java

@@ -62,7 +62,6 @@ public class BStudentController extends PaginationController<BStudent> {
                 MessageConstant.MESSAGE_ALERT_ERROR,
                 bStudent);
     }
-
     @ApiOperation(value="excel导入", notes="excel导入学生信息")
     @ApiImplicitParam(name = "importFile", value = "excel文件", required = true, dataType = "MultipartFile")
     @PreAuthorize("hasRole('ROLE_1001')")
@@ -75,6 +74,7 @@ public class BStudentController extends PaginationController<BStudent> {
                 data.getInfluenceReason());
     }
 
+
     @ApiOperation(value="唯一查找", notes="根据ID查找一条记录")
     @ApiImplicitParam(name = "businessId", value = "businessId", required = true, dataType = "varchar")
     @GetMapping(value = "/one")
@@ -171,4 +171,14 @@ public class BStudentController extends PaginationController<BStudent> {
         GridModel gridModel = getGridModelResponse();
         return gridModel;
     }
+
+
+    @ApiOperation(value="根据班级code查询班组所属学生", notes="根据班级code查询班组所属学生")
+    @ApiImplicitParam(name = "classesCode", value = "班级编号  逗号隔开", required = true, dataType = "varchar")
+    @GetMapping(value = "/queryStudentByClassesCode")
+    public GridModel queryStudentByClassesCode(String classesCode) {
+        List<BStudent> bStudents = bStudentService.queryStudentByPagination(getPaginationUtility(),classesCode);
+        GridModel gridModel = getGridModelResponse();
+        return gridModel;
+    }
 }

src/main/java/org/rcisoft/business/bstudent/dao/BStudentRepository.java

@@ -24,28 +24,13 @@ public interface BStudentRepository extends BaseMapper<BStudent> {
     * @return
     */
     @Select("<script>SELECT\n" +
-            "\tb.`business_id`,\n" +
-            "\tb.`code`,\n" +
-            "\tb.`is_recommend`,\n" +
-            "\tb.`recommend_order`,\n" +
-            "\tb.`recommend_course`,\n" +
-            "\tb.`recommend_date`,\n" +
-            "\tb.create_by,\n" +
-            "\tb.create_date,\n" +
-            "\tb.del_flag,\n" +
-            "\tb.flag,\n" +
-            "\tb.remarks,\n" +
-            "\tb.update_by,\n" +
-            "\tb.update_date,\n" +
-            "\tu.`name`,\n" +
-            "\tu.email,\n" +
-            "\tu.phone,\n" +
-            "\tu.sex,\n" +
-            "\tu.head_pic\n" +
-            "FROM\n" +
-            "\tb_student b\n" +
+            "b.`business_id`,b.`code`, b.`is_recommend`, b.`recommend_order`,b.`recommend_course`,b.`recommend_date`,\n" +
+            "b.create_by,b.create_date,b.del_flag,b.flag,b.remarks,b.update_by,b.update_date,u.`name`,\n" +
+            "u.email,u.phone,u.sex,u.head_pic,b.grade_code,bg.`name` as gradeName\n" +
+            "FROM b_student b\n" +
             "LEFT JOIN s_user u ON b.`code` = u.login_name\n" +
-            " where b.del_flag != 1 and b.flag = 1 "+
+            "LEFT JOIN b_grade bg ON b.grade_code = bg.`code`\n" +
+            "where b.del_flag != 1 and b.flag = 1  "+
             "<if test=\"name!=null and name != ''\">and u.`name` like CONCAT('%',#{name},'%') </if>"+
             "<if test=\"code!=null and code != ''\">and b.`code` like CONCAT('%',#{code},'%') </if></script>")
     @ResultMap(value = "BaseResultMap" )
@@ -161,5 +146,11 @@ public interface BStudentRepository extends BaseMapper<BStudent> {
 
     @Select("<script>select business_id from b_student where code = #{studentCode} and del_flag != 1 and flag = 1</script>")
     String queryStudentIdByCode(String studentCode);
+
+    @Select("<script>select * from b_student bs " +
+            "LEFT JOIN b_r_class_student cs on bs.`code` = cs.student_code " +
+            "where cs.class_code = #{classCode} and del_flag != 1 and flag = 1</script>")
+    @ResultMap(value = "BaseResultMap")
+    List<BStudent> queryStudentsByClassCode(String classCode);
 }
 

src/main/java/org/rcisoft/business/bstudent/entity/BStudent.java

@@ -82,5 +82,9 @@ public class BStudent extends IdEntity<BStudent> {
 
     @Transient
     private String finishNum;
+
+    /**年级名称*/
+    @Transient
+    private String gradeName;
 }
 

src/main/java/org/rcisoft/business/bstudent/service/BStudentService.java

@@ -79,4 +79,6 @@ public interface BStudentService{
     List<BStudent> queryStudentsWithIsRecommendByPagination(PageUtil pageUtil);
 
     List<BStudent> queryStudentInSlByPagination(PageUtil pageUtil, String slCode, String classCode, String keyWord, String slId);
+
+    List<BStudent> queryStudentByPagination(PageUtil pageUtil, String classesCode);
 }

src/main/java/org/rcisoft/business/bstudent/service/impl/BStudentServiceImpl.java

@@ -182,7 +182,7 @@ public class BStudentServiceImpl implements BStudentService {
             else
                 value[2] = "";
             //1. 添加user
-            SysUser user = new SysUser(value[0], passwordEncoder.encode("123456"), value[1], value[2]);  //学号，密码，姓名，性别;
+            SysUser user = new SysUser(value[0], passwordEncoder.encode(global.getDEFAULT_PASSWORD()), value[1], value[2]);  //学号，密码，姓名，性别;
             user.setEmail(value[3]);
             UserUtil.setCurrentPersistOperation(user);
             //2 创建gitlab账户
@@ -293,6 +293,16 @@ public class BStudentServiceImpl implements BStudentService {
         return bStudentRepository.queryStudentInSl(slCode,classCode,keyWord,slId);
     }
 
+    @Override
+    public List<BStudent> queryStudentByPagination(PageUtil pageUtil, String classesCode) {
+        List<BStudent> students = new ArrayList<>();
+        for(String classCode : classesCode.split(",")){
+            List<BStudent> studentList = bStudentRepository.queryStudentsByClassCode(classCode);
+            students.addAll(studentList);
+        }
+        return students;
+    }
+
     private Map<String, Object> queryParamHandler(BStudent model) {
         Map param = new HashMap<String, Object>();
         if (model.getName() != null)

src/main/java/org/rcisoft/business/bteacher/controller/BTeacherController.java

@@ -44,6 +44,7 @@ public class BTeacherController extends PaginationController<BTeacher> {
             @ApiImplicitParam(name = "recommendDate", value = "推荐时间，排序依据", required = false, dataType = "varchar"),
             @ApiImplicitParam(name = "recommendOrder", value = "推荐排序", required = false, dataType = "varchar"),
             @ApiImplicitParam(name = "recommendCourse", value = "推荐原因(1-200)", required = false, dataType = "varchar"),
+            @ApiImplicitParam(name = "agencyCode", value = "所属教学单位", required = false, dataType = "varchar"),
             @ApiImplicitParam(name = "remarks", value = "备注", required = false, dataType = "varchar")})
     @PreAuthorize("hasRole('ROLE_1001')")
     @PostMapping(value = "/add")

src/main/java/org/rcisoft/business/bteacher/service/impl/BTeacherServiceImpl.java

@@ -137,7 +137,7 @@ public class BTeacherServiceImpl implements BTeacherService {
                 value[2] = "";
 
             //1. 添加user
-            SysUser user = new SysUser(value[0], passwordEncoder.encode("123456"), value[1], value[2]);  //学号，密码，姓名，性别;
+            SysUser user = new SysUser(value[0], passwordEncoder.encode(global.getDEFAULT_PASSWORD()), value[1], value[2]);  //学号，密码，姓名，性别;
             user.setEmail(value[3]);
             UserUtil.setCurrentPersistOperation(user);
             //2 创建gitlab账户

src/main/java/org/rcisoft/business/tpaperchapter/dao/TPaperChapterRepository.java

@@ -22,8 +22,8 @@ public interface TPaperChapterRepository extends BaseMapper<TPaperChapter> {
     *
     */
     @Select("<script>select * from t_paper_chapter where 1=1 "
-            + "<if test=\"delFlag !=null and delFlag != '' \">and del_flag = #{delFlag} </if>' "
-            + "<if test=\"flag !=null and flag != '' \">and flag = #{flag} </if>' "
+            + "<if test=\"delFlag !=null and delFlag != '' \">and del_flag = #{delFlag} </if> "
+            + "<if test=\"flag !=null and flag != '' \">and flag = #{flag} </if> "
             + "</script>")
     @ResultMap(value = "BaseResultMap" )
     List<TPaperChapter> queryTPaperChapters(TPaperChapter tPaperChapter);

src/main/java/org/rcisoft/core/model/UserAuthDTO.java

 package org.rcisoft.core.model;
 
 import lombok.Data;
+import org.rcisoft.sys.menu.entity.MenuDto;
+
+import java.util.List;
 
 /**
  * Created by gaowenfeng on 2017/8/4.
@@ -12,5 +15,5 @@ public class UserAuthDTO {
     private String headPic;
     private String roleCode;
     private String token;
-    private String menus;
+    private List<MenuDto> menus;
 }

src/main/java/org/rcisoft/core/result/ResultServiceEnums.java

@@ -156,7 +156,9 @@ public enum ResultServiceEnums {
 
     PERVIOUS_NOT_ENABLED (84,"启用失败，在此之前存在未启用的课程节点"),
 
-    NEXT_NOT_DISABLED (85,"停用失败，在此之后存在未停用的课程节点")
+    NEXT_NOT_DISABLED (85,"停用失败，在此之后存在未停用的课程节点"),
+
+    CODE_IS_EXISTS (86,"编号重复")
 
     ;
 

src/main/java/org/rcisoft/core/service/impl/AuthenticationServiceImpl.java

 package org.rcisoft.core.service.impl;
 
+import org.apache.ibatis.annotations.Select;
 import org.rcisoft.common.component.Global;
 import org.rcisoft.core.model.UserAuthDTO;
 import org.rcisoft.core.exception.ServiceException;
@@ -7,6 +8,8 @@ import org.rcisoft.core.result.ResultExceptionEnum;
 import org.rcisoft.core.result.ResultServiceEnums;
 import org.rcisoft.core.service.AuthenticationService;
 import org.rcisoft.core.util.JwtUtil;
+import org.rcisoft.sys.menu.dao.SysMenuRepository;
+import org.rcisoft.sys.menu.entity.MenuDto;
 import org.rcisoft.sys.role.dao.SysRoleRepository;
 import org.rcisoft.sys.role.entity.SysRole;
 import org.rcisoft.sys.user.dao.SysUserMapper;
@@ -45,6 +48,9 @@ public class AuthenticationServiceImpl implements AuthenticationService {
     @Autowired
     private PasswordEncoder passwordEncoder;
 
+    @Autowired
+    private SysMenuRepository sysMenuRepository;
+
     @Autowired
     private Global global;
 
@@ -91,6 +97,9 @@ public class AuthenticationServiceImpl implements AuthenticationService {
         }else{
             throw new ServiceException(ResultServiceEnums.ROLE_ERROR);
         }
+
+        //查询菜单权限
+        List<MenuDto> menus = sysMenuRepository.queryMeunsByRoleId(role.get(0).getBusinessId());
         final String token = JwtUtil.generateToken(userDetails);
         SecurityContextHolder.getContext().setAuthentication(authentication);
 
@@ -99,6 +108,7 @@ public class AuthenticationServiceImpl implements AuthenticationService {
         userAuthDTO.setHeadPic(sysUser.getHeadPic());
         userAuthDTO.setRoleCode(role.get(0).getCode());
         userAuthDTO.setToken(token);
+        userAuthDTO.setMenus(menus);
         return userAuthDTO;
     }
 

src/main/java/org/rcisoft/sys/dept/dao/SysDeptRepository.java

@@ -22,7 +22,7 @@ public interface SysDeptRepository extends BaseMapper<SysDept> {
      */
     @Select("<script>SELECT "
             + "business_id,PARENT_ID,DEPT_CODE,SEQ_DATE,NAME "
-            + "FROM sys_dept "
+            + "FROM s_dept "
             + "WHERE "
             + "PARENT_ID IS NULL "
             + "AND DEL_FLAG = '0' </script>")
@@ -37,7 +37,7 @@ public interface SysDeptRepository extends BaseMapper<SysDept> {
      */
     @Select("<script>SELECT "
             + "business_id,PARENT_ID,DEPT_CODE,SEQ_DATE,NAME "
-            + "FROM sys_dept "
+            + "FROM s_dept "
             + "WHERE "
             + "DEL_FLAG = '0' AND PARENT_ID = #{pid}</script>")
     @ResultMap(value = "BaseResultMap")
@@ -53,10 +53,10 @@ public interface SysDeptRepository extends BaseMapper<SysDept> {
     		+ " IF ( "
     		+ " (  "
     		+ " SELECT  count(*)  "
-    		+ "FROM sys_dept_role rd "
+    		+ "FROM s_dept_role rd "
     		+ "where rd.DEPT_ID = d.business_id  and rd.ROLE_ID = #{roleId}"
     		+ " ) > 0,  '1',  '0'  )"
-    		+ " AS checked  FROM sys_dept d WHERE  d.DEL_FLAG = '0' AND d.PARENT_ID =#{pid}</script>")
+    		+ " AS checked  FROM s_dept d WHERE  d.DEL_FLAG = '0' AND d.PARENT_ID =#{pid}</script>")
     @ResultMap(value = "BaseResultMap")
     List<SysDept> queryDeptTreeByParentIdRoleId(@Param("roleId") String roleId, @Param("pid") String pid);
 
@@ -68,7 +68,7 @@ public interface SysDeptRepository extends BaseMapper<SysDept> {
      */
     @Select("<script>SELECT "
             + "* "
-            + "FROM sys_dept "
+            + "FROM s_dept "
             + "WHERE "
             + "DEL_FLAG = '0' AND DEPT_CODE = #{deptCode}</script>")
     @ResultMap(value = "BaseResultMap")
@@ -80,9 +80,9 @@ public interface SysDeptRepository extends BaseMapper<SysDept> {
      * @param deptId
      * @return
      */
-    @Delete("<script>DELETE from sys_dept_role_user where DEPT_ROLE_ID="
+    @Delete("<script>DELETE from s_dept_role_user where DEPT_ROLE_ID="
     		+ "("
-    		+ "SELECT business_id from sys_dept_role  where DEPT_ID=#{deptId}"
+    		+ "SELECT business_id from s_dept_role  where DEPT_ID=#{deptId}"
     		+ ")</script>")
     int deleteDeptRoleUserByDeptId(@Param("deptId") String deptId);
 
@@ -92,6 +92,6 @@ public interface SysDeptRepository extends BaseMapper<SysDept> {
      * @param deptId
      * @return
      */
-    @Delete("<script>DELETE from sys_dept_role where DEPT_ID=#{deptId}</script>")
+    @Delete("<script>DELETE from s_dept_role where DEPT_ID=#{deptId}</script>")
     int deleteDeptRoleByDeptId(@Param("deptId") String deptId);
 }

src/main/java/org/rcisoft/sys/dept/entity/SysDept.java

@@ -17,7 +17,7 @@ import java.util.Date;
  * Created by lcy on 16/7/30.
  */
 @Entity
-@Table(name = "sys_dept")
+@Table(name = "s_dept")
 @Data
 @NoArgsConstructor
 @AllArgsConstructor

src/main/java/org/rcisoft/sys/menu/controller/SysMenuController.java

@@ -37,10 +37,10 @@ public class SysMenuController extends ResponseController {
         return sysMenuServiceImpl.queryMenuTree();
     }
 
-    @ApiOperation(value="根据用户权限获取菜单", notes="根据用户权限获取菜单(已获取权限的为选中状态)")
-    @ApiImplicitParam(name = "id", value = "用户ID", required = true, dataType = "Integer", paramType = "path")
-    @GetMapping("queryMenusOfRolePermission/{id}")
-    public List<TreeViewModel> queryMenusOfRolePermission(@PathVariable("id") String id){
+    @ApiOperation(value="根据角色ID获取菜单", notes="根据角色ID获取菜单(已获取权限的为选中状态)")
+    @ApiImplicitParam(name = "id", value = "角色ID", required = true, dataType = "varchar", paramType = "path")
+    @GetMapping("queryMenusOfRolePermission")
+    public List<TreeViewModel> queryMenusOfRolePermission(String id){
         return sysMenuServiceImpl.queryMenuTreeForSelectedByRP(id);
     }
 

src/main/java/org/rcisoft/sys/menu/dao/SysMenuRepository.java

@@ -3,6 +3,7 @@ package org.rcisoft.sys.menu.dao;
 
 import org.apache.ibatis.annotations.*;
 import org.rcisoft.core.base.BaseMapper;
+import org.rcisoft.sys.menu.entity.MenuDto;
 import org.rcisoft.sys.menu.entity.SysMenu;
 import org.springframework.stereotype.Repository;
 
@@ -27,14 +28,14 @@ public interface SysMenuRepository extends BaseMapper<SysMenu> {
     @Select("<script>SELECT " +
             " m.*,'' as checked " +
             " FROM " +
-            " sys_menu m " +
-            " LEFT JOIN SYS_ROLE_MENU rm ON m.BUSINESS_ID = rm.MENU_ID "+
-            " LEFT JOIN sys_dept_role dr ON rm.ROLE_ID = dr.ROLE_ID "+ 
-            " LEFT JOIN sys_dept_role_user dru ON dr.BUSINESS_ID = dru.DEPT_ROLE_ID  " +
+            " s_menu m " +
+            " LEFT JOIN s_role_MENU rm ON m.BUSINESS_ID = rm.MENU_ID "+
+            " LEFT JOIN s_dept_role dr ON rm.ROLE_ID = dr.ROLE_ID "+ 
+            " LEFT JOIN s_dept_role_user dru ON dr.BUSINESS_ID = dru.DEPT_ROLE_ID  " +
             " where m.DEL_FLAG = '0' and m.FLAG = '1' and  dru.USER_ID = #{id} order by CASE_COUNT asc,SORT asc</script>")
     @ResultMap(value = "BaseResultMap")
     List<SysMenu> findByUserId(@Param("id") String id);
-    //sys_dept_role_user,,sys_dept_role,,sys_role_menu
+    //s_dept_role_user,,s_dept_role,,s_role_menu
 
 
     /**
@@ -44,7 +45,7 @@ public interface SysMenuRepository extends BaseMapper<SysMenu> {
     @Select("<script>SELECT "
             + " BUSINESS_ID,PARENT_ID,PARENT_IDS,HREF,TARGET,ICON,SORT,IS_SHOW,"
             + " CODE,NAME,IS_ACTIVITI,PERMISSION,REMARKS,'' as checked"
-            + " FROM sys_menu "
+            + " FROM s_menu "
             + " WHERE "
             + " PARENT_ID IS NULL "
             + " AND DEL_FLAG = '0' order by sort asc</script>")
@@ -60,7 +61,7 @@ public interface SysMenuRepository extends BaseMapper<SysMenu> {
     @Select("<script>SELECT "
             + " BUSINESS_ID,PARENT_ID,PARENT_IDS,HREF,TARGET,ICON,SORT,IS_SHOW,"
             +"  CODE,NAME,IS_ACTIVITI,PERMISSION,REMARKS,'' as checked"
-            + " FROM sys_menu "
+            + " FROM s_menu "
             + " WHERE "
             + " DEL_FLAG = '0' AND PARENT_ID = #{pid} order by sort asc</script>")
     @ResultMap(value = "BaseResultMap")
@@ -78,7 +79,7 @@ public interface SysMenuRepository extends BaseMapper<SysMenu> {
      * @param menu
      * @return
      */
-    @Update("<script>update sys_menu set " +
+    @Update("<script>update s_menu set " +
             " HREF = #{menu.href}," +
             " TARGET = #{menu.target}," +
             " ICON = #{menu.icon}," +
@@ -115,13 +116,13 @@ public interface SysMenuRepository extends BaseMapper<SysMenu> {
             "  SELECT " +
             "   count(*) " +
             "  FROM " +
-            "   SYS_ROLE_MENU rm where rm.MENU_ID = menu.BUSINESS_ID " +
+            "   s_role_menu rm where rm.MENU_ID = menu.BUSINESS_ID " +
             "   and rm.ROLE_ID = #{roleId} " +
             " ) > 0, " +
             " '1', " +
             " '0' " +
             ") AS checked"
-            + " FROM sys_menu menu"
+            + " FROM s_menu menu"
             + " WHERE "
             + " menu.DEL_FLAG = '0' AND menu.PARENT_ID = #{pid} order by menu.sort asc</script>")
     @ResultMap(value = "BaseResultMap")
@@ -132,6 +133,11 @@ public interface SysMenuRepository extends BaseMapper<SysMenu> {
      * @param menuId
      * @return
      */
-    @Delete("<script>DELETE from sys_role_menu where MENU_ID=#{menuId}</script>")
+    @Delete("<script>DELETE from s_role_menu where MENU_ID=#{menuId}</script>")
     int deleteRoleMenuByMenuId(@Param("menuId") String menuId);
+
+    @Select("<script>select m.BUSINESS_ID,PARENT_ID,PARENT_IDS,NAME,CODE from s_menu m " +
+            "LEFT JOIN s_role_menu rm on m.BUSINESS_ID = rm.MENU_ID " +
+            "where rm.ROLE_ID = #{roleId}</script>")
+    List<MenuDto> queryMeunsByRoleId(String roleId);
 }

src/main/java/org/rcisoft/sys/menu/entity/MenuDto.java

+package org.rcisoft.sys.menu.entity;
+
+import lombok.Data;
+
+/**
+ * Created by Administrator on 2018/4/19.
+ */
+@Data
+public class MenuDto {
+    private String businessId;
+    private String code;
+    private String name;
+    private String parentId;
+    private String parentIds;
+}

src/main/java/org/rcisoft/sys/role/controller/SysRoleController.java

@@ -33,7 +33,7 @@ public class SysRoleController extends PaginationController<SysRole> {
     @ApiImplicitParams({@ApiImplicitParam(name = "name", value = "角色名称", required = false, dataType = "varchar"),
             @ApiImplicitParam(name = "code", value = "权限编号", required = false, dataType = "varchar")})
     @GetMapping(value = "/queryRoles")
-    public GridModel queryRoles(SysRole sysRole){
+    public GridModel queryRolesByPagination(SysRole sysRole){
         sysRoleServiceImpl.queryRolesByPagination(getPaginationUtility(), sysRole);
         GridModel gridModel = getGridModelResponse();
         return  gridModel;
@@ -56,20 +56,20 @@ public class SysRoleController extends PaginationController<SysRole> {
 
 
     @ApiOperation(value="删除角色", notes="删除角色")
-    @ApiImplicitParam(name = "id", value = "businessId", required = true, dataType = "varchar", paramType = "path")
+    @ApiImplicitParam(name = "businessId", value = "businessId", required = true, dataType = "varchar", paramType = "path")
     @PostMapping(value = "/delete")
-    public Result roleDelete(@PathVariable("id") String id){
+    public Result roleDelete(String businessId){
 
-        int line = sysRoleServiceImpl.removeRole(id,getToken());
+        int line = sysRoleServiceImpl.removeRole(businessId,getToken());
         return Result.builder(new PersistModel(line),
                 MessageConstant.MESSAGE_ALERT_SUCCESS,
                 MessageConstant.MESSAGE_ALERT_ERROR,
-                id);
+                businessId);
     }
 
     @ApiOperation(value="权限分配", notes="权限分配")
     @ApiImplicitParams({@ApiImplicitParam(name = "roleId", value = "businessId", required = true, dataType = "varchar"),
-            @ApiImplicitParam(name = "menus", value = "菜单Code，逗号间隔", required = true, dataType = "varchar")})
+            @ApiImplicitParam(name = "menus", value = "菜单id，逗号间隔", required = true, dataType = "varchar")})
     @PostMapping(value = "/rolePermission")
     public Result rolePermission(@RequestParam("roleId") String roleId, @RequestParam("menus") String menus ){
 

src/main/java/org/rcisoft/sys/role/dao/SysRoleRepository.java

@@ -55,7 +55,7 @@ public interface SysRoleRepository extends BaseMapper<SysRole> {
      * @param roleId
      * @return
      */
-    @Delete("<script>delete from sys_dept_role where role_id = #{roleId}</script>")
+    @Delete("<script>delete from s_dept_role where role_id = #{roleId}</script>")
     int deleteRoleDepts(@Param("roleId") String roleId);
 
     /**
@@ -80,11 +80,11 @@ public interface SysRoleRepository extends BaseMapper<SysRole> {
     @Select(" <script>select "
     		+ " dr.BUSINESS_ID drid,r.BUSINESS_ID rid,r.name rname,r.code rcode,d.BUSINESS_ID did,d.name dname,d.dept_code deptcode, "
     		+ " IF(( "
-    		+ " SELECT count(*) from sys_dept_role_user dru where dru.USER_ID=#{userId} "
+    		+ " SELECT count(*) from s_dept_role_user dru where dru.USER_ID=#{userId} "
     		+ " and dru.DEPT_ROLE_ID=dr.BUSINESS_ID"
     		+ " )>0,'1','0') as checked "
-    		+ " FROM  sys_dept_role dr "
-    		+ " LEFT JOIN sys_dept d ON d.BUSINESS_ID = dr.DEPT_ID "
+    		+ " FROM  s_dept_role dr "
+    		+ " LEFT JOIN s_dept d ON d.BUSINESS_ID = dr.DEPT_ID "
     		+ " LEFT JOIN s_role r on dr.ROLE_ID = r.BUSINESS_ID</script>")
     @ResultMap(value = "drResultMap" )
     List<DeptRole> queryUserRolesByPagination(@Param("userId") String userId, SysRole sysRole) ;
@@ -109,7 +109,7 @@ public interface SysRoleRepository extends BaseMapper<SysRole> {
             "  SELECT " +
             "   count(*) " +
             "  FROM " +
-            "   SYS_DEPT_ROLE dr " +
+            "   s_dept_ROLE dr " +
             "  WHERE " +
             "   dr.ROLE_ID = sysRole.BUSINESS_ID " +
             "  AND ur.USER_ID = #{deptId}  " +
@@ -124,9 +124,9 @@ public interface SysRoleRepository extends BaseMapper<SysRole> {
     @ResultMap(value = "BaseResultMap" )
     List<SysRole> queryDeptRolesByPagination(@Param("deptId") String deptId, SysRole sysRole);
      
-    @Delete("<script>DELETE from sys_dept_role_user where DEPT_ROLE_ID="
+    @Delete("<script>DELETE from s_dept_role_user where DEPT_ROLE_ID="
     		+ "("
-    		+ "SELECT BUSINESS_ID from sys_dept_role  where ROLE_ID=#{roleId}"
+    		+ "SELECT BUSINESS_ID from s_dept_role  where ROLE_ID=#{roleId}"
     		+ ")</script>")
     int deleteDeptRoleUserByroleId(@Param("roleId") String roleId);
 
@@ -135,7 +135,7 @@ public interface SysRoleRepository extends BaseMapper<SysRole> {
       * @param roleId
      * @return
      */
-    @Delete("<script>DELETE from sys_dept_role where ROLE_ID=#{roleId}</script>")
+    @Delete("<script>DELETE from s_dept_role where ROLE_ID=#{roleId}</script>")
     int deleteDeptRoleByRoleId(@Param("roleId") String roleId);
 
     /**
@@ -182,4 +182,10 @@ public interface SysRoleRepository extends BaseMapper<SysRole> {
 
     @Delete("<script>DELETE from s_r_user_role where role_id=#{id}</script>")
     int deleteUserRoleByRoleId(String id);
+
+    @Select("<script>select * from s_role where flag = '1' and del_flag = '0' "
+            + "and role_name = #{roleName}"
+            + "</script>")
+    @ResultMap(value = "BaseResultMap" )
+    List<SysRole> queryRolesByName(SysRole sysRole);
 }

src/main/java/org/rcisoft/sys/role/service/SysRoleService.java

@@ -35,11 +35,11 @@ public interface SysRoleService {
     SysRole queryRoleById(String id);
     /**
      * 分页查询角色
-     * @param paginationUtility
+     * @param pageUtil
      * @param sysRole
      * @return
      */
-    public List<SysRole> queryRolesByPagination(PageUtil<SysRole> paginationUtility, SysRole sysRole);
+    public List<SysRole> queryRolesByPagination(PageUtil pageUtil, SysRole sysRole);
 
     //select 
     List<SysRole> queryRolesSelect(SysRole sysRole);

src/main/java/org/rcisoft/sys/role/service/impl/SysRoleServiceImpl.java

@@ -40,14 +40,18 @@ public class SysRoleServiceImpl implements SysRoleService {
     @Override
     public int persistRole(SysRole sysRole, String token) {
         int line;
-        List<SysRole> roles = sysRoleRepository.queryRolesByCodeOrName(sysRole);
-        if(roles.size()>0){
-            throw new ServiceException(ResultServiceEnums.ROLE_EXISTS);
-        }
         if(sysRole.getBusinessId()!=null){//修改
+            List<SysRole> roles = sysRoleRepository.queryRolesByName(sysRole);
+            if(roles.size()>0){
+                throw new ServiceException(ResultServiceEnums.ROLE_EXISTS);
+            }
             UserUtil.setCurrentMergeOperation(sysRole);
             line = sysRoleRepository.updateByPrimaryKeySelective(sysRole);
         }else{//增加
+            List<SysRole> roles = sysRoleRepository.queryRolesByCodeOrName(sysRole);
+            if(roles.size()>0){
+                throw new ServiceException(ResultServiceEnums.ROLE_EXISTS);
+            }
             UserUtil.setCurrentPersistOperation(sysRole);
             line = sysRoleRepository.insertSelective(sysRole);
         }
@@ -71,7 +75,7 @@ public class SysRoleServiceImpl implements SysRoleService {
     }
 
     @Override
-    public List<SysRole> queryRolesByPagination(PageUtil<SysRole> paginationUtility, SysRole sysRole) {
+    public List<SysRole> queryRolesByPagination(PageUtil pageUtil, SysRole sysRole) {
         sysRole.setNotDeleted();
         sysRole.setStart();
         return sysRoleRepository.queryRoles(sysRole);

src/main/java/org/rcisoft/sys/user/controller/SysUserController.java

@@ -5,19 +5,19 @@ import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.rcisoft.common.component.Global;
 import org.rcisoft.common.controller.PaginationController;
+import org.rcisoft.common.model.GridModel;
 import org.rcisoft.core.constant.MessageConstant;
 import org.rcisoft.core.exception.ServiceException;
 import org.rcisoft.core.model.PersistModel;
 import org.rcisoft.core.result.Result;
 import org.rcisoft.core.result.ResultServiceEnums;
 import org.rcisoft.core.util.UserUtil;
+import org.rcisoft.sys.menu.entity.SysMenu;
 import org.rcisoft.sys.user.entity.SysUser;
 import org.rcisoft.sys.user.service.SysUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.crypto.password.PasswordEncoder;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import springfox.documentation.annotations.ApiIgnore;
 
 /**
@@ -44,7 +44,7 @@ public class SysUserController extends PaginationController<SysUser> {
             @ApiImplicitParam(name = "roleId", value = "角色Id", required = true, dataType = "varchar")})
     @PostMapping(value = "/addUser")
     public Result addUser(@ApiIgnore SysUser user){
-        int line = userServiceImpl.persistUser(user);
+        int line = userServiceImpl.addOrUpdateUser(user);
         return Result.builder(new PersistModel(line),
                 MessageConstant.MESSAGE_ALERT_SUCCESS,
                 MessageConstant.MESSAGE_ALERT_ERROR,
@@ -78,12 +78,36 @@ public class SysUserController extends PaginationController<SysUser> {
 
     @ApiOperation(value = "重置密码", notes = "根据用户学号或者工号重置密码")
     @PostMapping("/resetPassword")
-    @ApiImplicitParam(name = "userCode", value = "学号或工号", required = true, dataType = "varchar")
-    public Result resetPassword (String userCode){
-        PersistModel persistModel = new PersistModel(userServiceImpl.resetPassword(userCode));
+    @ApiImplicitParams({@ApiImplicitParam(name = "userCode", value = "学号或工号", required = false, dataType = "varchar"),
+        @ApiImplicitParam(name = "businessId", value = "businessId", required = false, dataType = "varchar")})
+    public Result resetPassword (String userCode, String businessId){
+        PersistModel persistModel = new PersistModel(userServiceImpl.resetPassword(userCode,businessId));
         return Result.builder(persistModel,
                 MessageConstant.MESSAGE_ALERT_SUCCESS,
                 MessageConstant.MESSAGE_ALERT_ERROR,
                 userCode);
     }
+
+
+    @ApiOperation(value="分页查询用户", notes="分页查询用户")
+    @ApiImplicitParam(name = "agencyCode", value = "教学单位Code", required = false, dataType = "varchar")
+    @GetMapping(value = "/queryUsers")
+    public GridModel queryUsers(SysUser sysUser){
+        userServiceImpl.queryUsersByPagination(getPaginationUtility(), sysUser);
+        GridModel gridModel = getGridModelResponse();
+        return  gridModel;
+    }
+
+    @ApiOperation(value="删除用户", notes="删除用户")
+    @ApiImplicitParam(name = "id", value = "businessId", required = true, dataType = "varchar", paramType = "path")
+    @PostMapping(value = "/delete")
+    public Result roleDelete(String id){
+
+        int line = userServiceImpl.removeUser(id,getToken());
+        return Result.builder(new PersistModel(line),
+                MessageConstant.MESSAGE_ALERT_SUCCESS,
+                MessageConstant.MESSAGE_ALERT_ERROR,
+                id);
+    }
+
 }

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

@@ -5,6 +5,7 @@ import org.apache.ibatis.annotations.*;
 import org.rcisoft.core.base.BaseMapper;
 import org.rcisoft.sys.user.entity.SysUser;
 import org.rcisoft.sys.user.entity.UserRole;
+import org.springframework.security.access.method.P;
 import org.springframework.stereotype.Repository;
 
 import java.util.ArrayList;
@@ -58,12 +59,24 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
     @Select("<script>select password from s_user where business_id = #{userId} </script>")
     String queryPasswordById(String userId);
 
-    @Update("update s_user set password = #{password} where login_name = #{userCode} and del_flag = 0 and flag = 1")
-    int resetPassword( @Param("userCode") String userCode, @Param("password") String password);
+    @Update("<script>update s_user set password = #{password} where 1=1 " +
+            "<if test=\"userCode !=null and userCode != '' \">and login_name = #{userCode} </if>" +
+            "<if test=\"businessId !=null and businessId != '' \">and business_id = #{businessId} </if> " +
+            "and del_flag = 0 and flag = 1</script>")
+    int resetPassword(@Param("userCode") String userCode, @Param("businessId") String businessId, @Param("password") String password);
 
     @Select("<script>select business_id from s_user where login_name = #{studentCode} and del_flag = 0 and flag = 1</script>")
     String queryUserIdByLoginName(String studentCode);
 
     @Delete("<script>delete from s_r_user_role where user_id = #{businessId}</script>")
     int deleteUserRole(String businessId);
+
+    @Select("<script>select su.*,ba.`name` as agencyName,sr.role_name as roleName,sr.business_id as roleId from s_user su " +
+            "LEFT JOIN b_agency ba on su.agency_code = ba.`code` " +
+            "LEFT JOIN s_r_user_role sru on su.business_id = sru.user_id " +
+            "LEFT JOIN s_role sr on sru.role_id = sr.business_id " +
+            "where su.is_created = '1' and su.del_flag = 0 and su.flag = 1  " +
+            "<if test=\"agencyCode !=null and agencyCode != '' \">and su.agency_code = #{agencyCode} </if></script>")
+    @ResultMap(value = "BaseResultMap")
+    List<SysUser> queryCreatedUsers(SysUser sysUser);
 }

src/main/java/org/rcisoft/sys/user/entity/SysUser.java

@@ -49,6 +49,8 @@ public class SysUser extends IdEntity<SysUser> {
     private String gitLabId; //gitLab账号id
     private String gitLabUsername; //gitLab账号
     private String gitLabImpressionToken; //gitLab账号模拟令牌
+    private String agencyCode;//教学单位
+    private String isCreated;//是否是创建的用户
 
     /**
      * 角色ID
@@ -56,6 +58,12 @@ public class SysUser extends IdEntity<SysUser> {
     @Transient
     private String roleId;
 
+    @Transient
+    private String roleName;
+
+    @Transient
+    private String agencyName;
+
 
     private Date loginDate;	// 最后登陆日期
 

src/main/java/org/rcisoft/sys/user/service/SysUserService.java

 package org.rcisoft.sys.user.service;
 
 
+import org.rcisoft.common.model.GridModel;
+import org.rcisoft.core.aop.PageUtil;
 import org.rcisoft.core.model.PersistModel;
 import org.rcisoft.sys.user.entity.SysUser;
 
-public interface SysUserService {
+import java.util.List;
 
+public interface SysUserService {
 
-	PersistModel addUser(SysUser user);
 
-    int persistUser(SysUser user);
+    PersistModel persistUser(SysUser user);
 
     void updateUser(SysUser user, String uid, int line);
 
@@ -17,5 +19,11 @@ public interface SysUserService {
 
     int changePassword(String userId, String newPassword);
 
-    int resetPassword(String userCode);
+    int resetPassword(String userCode, String businessId);
+
+    int addOrUpdateUser(SysUser user);
+
+    List<SysUser> queryUsersByPagination(PageUtil pageUtil, SysUser sysUser);
+
+    int removeUser(String id, String token);
 }

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

 package org.rcisoft.sys.user.service.impl;
 
 import org.rcisoft.common.component.Global;
+import org.rcisoft.common.model.GridModel;
+import org.rcisoft.core.aop.PageUtil;
 import org.rcisoft.core.constant.UserConstant;
 import org.rcisoft.core.exception.ServiceException;
 import org.rcisoft.core.model.PersistModel;
@@ -16,6 +18,9 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Isolation;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
 @Service
 @Transactional(readOnly = true,propagation = Propagation.NOT_SUPPORTED)
 public class SysUserServiceImpl implements SysUserService {
@@ -30,16 +35,20 @@ public class SysUserServiceImpl implements SysUserService {
 	private Global global;
 
 
-	@Transactional(propagation = Propagation.REQUIRED,readOnly = false)
+
+	@Transactional(propagation = Propagation.REQUIRED,isolation = Isolation.DEFAULT)
 	@Override
-	public PersistModel addUser(SysUser user) {
+	public PersistModel persistUser(SysUser user) {
+		user.setCommonBusinessId();
+		user.setPassword(passwordEncoder.encode(global.getDEFAULT_PASSWORD()));
 		int line = sysUserMapper.insertSelective(user);
 		return new PersistModel(line);
 	}
 
+
 	@Transactional(propagation = Propagation.REQUIRED,isolation = Isolation.DEFAULT)
 	@Override
-	public int persistUser(SysUser user) {
+	public int addOrUpdateUser(SysUser user) {
 		int line;
 		if(user.getBusinessId()!=null){//修改
 			UserUtil.setCurrentMergeOperation(user);
@@ -50,14 +59,32 @@ public class SysUserServiceImpl implements SysUserService {
 		}else{//添加
 			UserUtil.setCurrentPersistOperation(user);
 			user.setPassword(passwordEncoder.encode(global.getDEFAULT_PASSWORD()));
+			user.setIsCreated("1");
 			line = sysUserMapper.insertSelective(user);
 		}
 		//添加新的角色
 		UserRole userRole = new UserRole(user.getBusinessId(),user.getRoleId());
+		userRole.setCommonBusinessId();
 		sysUserMapper.insertUserRole(userRole);
 		return line;
 	}
 
+	@Override
+	public List<SysUser> queryUsersByPagination(PageUtil pageUtil, SysUser sysUser) {
+		sysUser.setStart();
+		sysUser.setNotDeleted();
+		return sysUserMapper.queryCreatedUsers(sysUser);
+	}
+
+	@Override
+	public int removeUser(String id, String token) {
+		SysUser user = new SysUser();
+		user.setDeleted();
+		user.setStop();
+		user.setBusinessId(id);
+		return sysUserMapper.logicalDelete(user);
+	}
+
 	@Override
 	public void updateUser(SysUser user,String uid,int line) {
 		if(!user.isEmpty()){
@@ -79,7 +106,10 @@ public class SysUserServiceImpl implements SysUserService {
 	}
 
 	@Override
-	public int resetPassword(String userCode) {
-		return sysUserMapper.resetPassword(userCode,passwordEncoder.encode("123456"));
+	public int resetPassword(String userCode, String businessId) {
+		if((userCode!=null&&!userCode.equals(""))&&(businessId!=null&&!businessId.equals(""))){
+			throw new ServiceException(ResultServiceEnums.PARAMETER_ERROR);
+		}
+		return sysUserMapper.resetPassword(userCode,businessId,passwordEncoder.encode(global.getDEFAULT_PASSWORD()));
 	}
 }

src/main/resources/mapper/business/bclass/mapper/BClassMapper.xml

@@ -15,17 +15,23 @@
         <result column="remarks" jdbcType="VARCHAR" property="remarks"/>
         <result column="type" jdbcType="VARCHAR" property="type" />
         <result column="grade_code" jdbcType="VARCHAR" property="gradeCode"/>
+        <result column="agency_code" jdbcType="VARCHAR" property="agencyCode"/>
     </resultMap>
 
     <select id="queryBClasss" resultMap="BaseResultMap">
-        SELECT * FROM b_class b
-        WHERE b.del_flag != '1' and flag = 1
+        SELECT b.*,bg.name as gradeName,ba.name as agencyName FROM b_class b
+        LEFT JOIN b_grade bg ON b.grade_code = bg.code
+        LEFT JOIN b_agency ba ON b.agency_code = ba.code
+        WHERE b.del_flag != '1' and b.flag = 1
         <if test="className!=null and className != ''">
               AND  (b.class_name LIKE CONCAT('%',#{className},'%') OR b.code LIKE CONCAT('%',#{className},'%'))
         </if>
         <if test="studentNum!=null and studentNum != ''">
               AND  b.student_num = #{studentNum}
         </if>
+        <if test="type!=null and type != ''">
+            AND  b.type = #{type}
+        </if>
     </select>
 
     <select id="updateStudentNum" statementType="CALLABLE">

src/main/resources/mapper/business/beduclass/mapper/BEduClassMapper.xml

@@ -14,7 +14,7 @@
             <result column="class_name" jdbcType="VARCHAR" property="className"/>
             <result column="agency_id" jdbcType="VARCHAR" property="agencyId"/>
             <result column="type" jdbcType="VARCHAR" property="type"/>
-            <result column="classes_id" jdbcType="VARCHAR" property="classesId"/>
+            <result column="classes_id" jdbcType="VARCHAR" property="classesCode"/>
             <result column="grade_id" jdbcType="VARCHAR" property="gradeId"/>
     </resultMap>
 

src/main/resources/mapper/sys/menu/mapper/menuMapper.xml

@@ -33,7 +33,7 @@
     <!-- 这种方式  必须配置 数据库连接  &allowMultiQueries=true-->
     <update id="logicRemoveMenus"  parameterType="java.util.List">
         <foreach collection="list" item="item" index="index" open="" close="" separator=";">
-          update sys_menu
+          update s_menu
           <set>
             DEL_FLAG = '1'
           </set>

src/main/resources/mapper/sys/role/mapper/roleMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="org.rcisoft.sys.role.dao.SysRoleRepository">
     <resultMap id="BaseResultMap"  type="org.rcisoft.sys.role.entity.SysRole">
         <id column="business_id" jdbcType="VARCHAR" property="businessId" />
-        <result column="name" jdbcType="VARCHAR" property="name" />
+        <result column="role_name" jdbcType="VARCHAR" property="roleName" />
         <result column="CODE" jdbcType="VARCHAR" property="code" />
         <result column="checked" jdbcType="VARCHAR" property="checked" />
         <result column="CREATE_BY" property="createBy" jdbcType="VARCHAR" />

src/main/resources/mapper/sys/user/mapper/UserMapper.xml

@@ -17,5 +17,7 @@
         <result column="FLAG" property="flag" jdbcType="VARCHAR" />
         <result column="update_date" property="updateDate" jdbcType="TIMESTAMP" />
         <result column="create_date" property="createDate" jdbcType="TIMESTAMP" />
+        <result column="agency_code" property="agencyCode" jdbcType="VARCHAR" />
+        <result column="is_created" property="isCreated" jdbcType="VARCHAR" />
     </resultMap>
 </mapper>
\ No newline at end of file