病组修改

bsoft-api/src/main/java/com/bsoft/api/mapper/SerDiseaseMapper.java

@@ -11,21 +11,30 @@ public interface SerDiseaseMapper {
 
     List<SerDisease> selectAll();
 
-    SerDisease selectByCode(@Param("code") String code,@Param("date") String date,@Param("docCode") String docCode,
+    SerDisease selectByCode(@Param("code") String code, @Param("date") String date, @Param("docCode") String docCode,
                             @Param("deptCode") String deptCode);
 
-    List<SerDisease> selectByMdcName(@Param("date") String date,@Param("mdcName") String mdcName,
-                                     @Param("docCode") String docCode,@Param("deptCode") String deptCode);
+    List<SerDisease> selectByMdcName(@Param("date") String date, @Param("mdcName") String mdcName,
+                                     @Param("docCode") String docCode, @Param("deptCode") String deptCode);
 
-    List<DiseaseLevel> selectByLevel(@Param("date") String date,@Param("level") Integer level,
-                                     @Param("docCode") String docCode,@Param("deptCode") String deptCode,
-                                     @Param("orgId") Long orgId,@Param("userId") Long userId);
+    List<DiseaseLevel> selectByLevel(@Param("date") String date, @Param("level") Integer level,
+                                     @Param("docCode") String docCode, @Param("deptCode") String deptCode,
+                                     @Param("orgId") Long orgId, @Param("userId") Long userId);
 
-    List<DiseaseLevel> selectByParentId(@Param("date") String date,@Param("parentId") Integer parentId,
-                                        @Param("docCode") String docCode,@Param("deptCode") String deptCode);
+    List<DiseaseLevel> selectByLevelNoZBZ(@Param("date") String date, @Param("level") Integer level,
+                                          @Param("docCode") String docCode, @Param("deptCode") String deptCode,
+                                          @Param("orgId") Long orgId, @Param("userId") Long userId);
 
-    DiseaseLevel selectParentById(@Param("date") String date,@Param("diseaseId") Integer diseaseId);
+    List<DiseaseLevel> selectByParentId(@Param("date") String date, @Param("parentId") Integer parentId,
+                                        @Param("docCode") String docCode, @Param("deptCode") String deptCode,
+                                        @Param("userId") Long userId);
 
-    List<DiseaseLevel> selectSonById(@Param("date") String date,@Param("diseaseId") Integer diseaseId,
-                                     @Param("docCode") String docCode,@Param("deptCode") String deptCode);
+    List<DiseaseLevel> selectByParentIdNoZbz(@Param("date") String date, @Param("parentId") Integer parentId,
+                                             @Param("docCode") String docCode, @Param("deptCode") String deptCode,
+                                             @Param("userId") Long userId);
+
+    DiseaseLevel selectParentById(@Param("date") String date, @Param("diseaseId") Integer diseaseId);
+
+    List<DiseaseLevel> selectSonById(@Param("date") String date, @Param("diseaseId") Integer diseaseId,
+                                     @Param("docCode") String docCode, @Param("deptCode") String deptCode);
 }
\ No newline at end of file

bsoft-api/src/main/java/com/bsoft/api/mapper/SysRoleMapper.java

 package com.bsoft.api.mapper;
 
 import com.bsoft.api.model.SysRole;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -14,4 +15,6 @@ public interface SysRoleMapper {
     List<SysRole> selectAll();
 
     int updateByPrimaryKey(SysRole record);
+
+    SysRole selectByUser(@Param("userId") Long userId);
 }
\ No newline at end of file

bsoft-api/src/main/java/com/bsoft/api/service/Impl/LoginServiceImpl.java

@@ -2,9 +2,11 @@ package com.bsoft.api.service.Impl;
 
 import com.bsoft.api.common.utils.TokenUtil;
 import com.bsoft.api.mapper.DicOrgMapper;
+import com.bsoft.api.mapper.SysRoleMapper;
 import com.bsoft.api.mapper.SysUserMapper;
 import com.bsoft.api.model.DicOrg;
 import com.bsoft.api.model.SerDepartment;
+import com.bsoft.api.model.SysRole;
 import com.bsoft.api.model.SysUser;
 import com.bsoft.api.service.LoginService;
 import com.bsoft.api.service.UserService;
@@ -26,6 +28,8 @@ public class LoginServiceImpl implements LoginService {
     private SysUserMapper sysUserMapper;
     @Resource
     private DicOrgMapper dicOrgMapper;
+    @Resource
+    private SysRoleMapper sysRoleMapper;
 
     @Override
     public LoginInfo login(String logName, String password, String ip) {
@@ -43,6 +47,10 @@ public class LoginServiceImpl implements LoginService {
             user.setPassword(null);
             loginInfo.setToken(token);
             loginInfo.setUser(user);
+
+            //查询用户角色
+            SysRole role = sysRoleMapper.selectByUser(user.getId());
+            loginInfo.setRole(role);
             //查询用户机构
             List<DicOrg> orgList = dicOrgMapper.selectByUser(user.getId());
             if (orgList != null && orgList.size() > 0) {

bsoft-api/src/main/java/com/bsoft/api/service/Impl/SerDiseaseServiceImpl.java

@@ -17,38 +17,38 @@ public class SerDiseaseServiceImpl implements SerDiseaseService {
     private SerDiseaseMapper serDiseaseMapper;
 
     @Override
-    public List<DiseaseLevel> selectListByIdorLevel(String date,String diseaseCode,Integer level,String docCode,String deptCode,Long userId) {
+    public List<DiseaseLevel> selectListByIdorLevel(String date, String diseaseCode, Integer level, String docCode, String deptCode, Long userId) {
         List<DiseaseLevel> list = new ArrayList<>();
         docCode = StringUtil.isNullOrEmpty(docCode) ? null : docCode;
         deptCode = StringUtil.isNullOrEmpty(deptCode) ? null : deptCode;
-        if(diseaseCode != null && diseaseCode != ""){
-            list = selectByCode(date,diseaseCode,docCode,deptCode);
-        }else{
-            list = selectByLevel(date,level,docCode,deptCode,userId);
+        if (diseaseCode != null && diseaseCode != "") {
+            list = selectByCode(date, diseaseCode, docCode, deptCode, userId);
+        } else {
+            list = selectByLevel(date, level, docCode, deptCode, userId);
         }
         return list;
     }
 
     @Override
-    public List<SerDisease> selectByMdcName(String date,String mdcName,String docCode,String deptCode) {
+    public List<SerDisease> selectByMdcName(String date, String mdcName, String docCode, String deptCode) {
         mdcName = StringUtil.isNullOrEmpty(mdcName) ? null : mdcName;
         docCode = StringUtil.isNullOrEmpty(docCode) ? null : docCode;
         deptCode = StringUtil.isNullOrEmpty(deptCode) ? null : deptCode;
-        return serDiseaseMapper.selectByMdcName(date,mdcName,docCode,deptCode);
+        return serDiseaseMapper.selectByMdcName(date, mdcName, docCode, deptCode);
     }
 
     /**
      * 根据Code查询父子级别列表
      *
-     * @param date 时间
+     * @param date        时间
      * @param diseaseCode ID
      * @return
      */
-    private List<DiseaseLevel> selectByCode(String date,String diseaseCode,String docCode,String deptCode) {
+    private List<DiseaseLevel> selectByCode(String date, String diseaseCode, String docCode, String deptCode, Long userId) {
 
 
-        SerDisease disease = serDiseaseMapper.selectByCode(diseaseCode,date,docCode,deptCode);
-        if(disease == null){
+        SerDisease disease = serDiseaseMapper.selectByCode(diseaseCode, date, docCode, deptCode);
+        if (disease == null) {
             return null;
         }
 
@@ -56,30 +56,35 @@ public class SerDiseaseServiceImpl implements SerDiseaseService {
         DiseaseLevel diseaseLevelResult = null;
         Integer diseaseId = disease.getId().intValue();
         //查询父级菜单对象(直到查询到顶级)
-        while(isParent){
-            DiseaseLevel diseaseLevel = serDiseaseMapper.selectParentById(date,diseaseId);
-            if(diseaseLevel != null){
+        while (isParent) {
+            DiseaseLevel diseaseLevel = serDiseaseMapper.selectParentById(date, diseaseId);
+            if (diseaseLevel != null) {
                 List<DiseaseLevel> sonList = new ArrayList<>();
-                if(diseaseLevelResult != null){
+                if (diseaseLevelResult != null) {
                     sonList.add(diseaseLevelResult);
                 }
                 diseaseLevel.setDiseaseLevelList(sonList);
                 diseaseId = diseaseLevel.getId().intValue();
                 diseaseLevelResult = diseaseLevel;
-            }else{
+            } else {
                 isParent = false;
             }
         }
 
         List<DiseaseLevel> parentList = new ArrayList<>();
         //查询同级菜单列表
-        List<DiseaseLevel> serDiseaseList = serDiseaseMapper.selectByParentId(date,disease.getParentId().intValue(),docCode,deptCode);
+        List<DiseaseLevel> serDiseaseList = null;
+        if (disease.getLevel().intValue() == 0) {
+            serDiseaseList = serDiseaseMapper.selectByParentId(date, disease.getParentId().intValue(), docCode, deptCode, userId);
+        } else {
+            serDiseaseList = serDiseaseMapper.selectByParentIdNoZbz(date, disease.getParentId().intValue(), docCode, deptCode, userId);
+        }
         List<DiseaseLevel> diseaseLevelList = new ArrayList<>();
-        for(DiseaseLevel serDiseases : serDiseaseList){
+        for (DiseaseLevel serDiseases : serDiseaseList) {
             DiseaseLevel diseaseLevel1 = new DiseaseLevel();
             //查询子级菜单列表
-            if(serDiseases.getMdcCode().equals(diseaseCode)){
-                List<DiseaseLevel> diseaseLevelList1 = serDiseaseMapper.selectSonById(date,disease.getId().intValue(),docCode,deptCode);
+            if (serDiseases.getMdcCode().equals(diseaseCode)) {
+                List<DiseaseLevel> diseaseLevelList1 = serDiseaseMapper.selectSonById(date, disease.getId().intValue(), docCode, deptCode);
                 diseaseLevel1.setDiseaseLevelList(diseaseLevelList1);
             }
             diseaseLevel1.setDate(serDiseases.getDate());
@@ -93,27 +98,27 @@ public class SerDiseaseServiceImpl implements SerDiseaseService {
             diseaseLevel1.setParentId(serDiseases.getParentId());
             diseaseLevelList.add(diseaseLevel1);
         }
-        if(diseaseLevelResult != null){
-            diseaseLevelResult = getSonDiseaseList(diseaseLevelResult,null,diseaseLevelList);
+        if (diseaseLevelResult != null) {
+            diseaseLevelResult = getSonDiseaseList(diseaseLevelResult, null, diseaseLevelList);
 //            diseaseLevelResult.setDiseaseLevelList(diseaseLevelList);
             parentList.add(diseaseLevelResult);
             return parentList;
-        }else{
+        } else {
             return diseaseLevelList;
         }
     }
 
 
-    private DiseaseLevel getSonDiseaseList(DiseaseLevel diseaseLevel,List<DiseaseLevel> diseaseLevelList,
+    private DiseaseLevel getSonDiseaseList(DiseaseLevel diseaseLevel, List<DiseaseLevel> diseaseLevelList,
                                            List<DiseaseLevel> diseaseLevelListSon) {
-        if(diseaseLevel != null && diseaseLevel.getDiseaseLevelList() != null && diseaseLevel.getDiseaseLevelList().size() > 0){
-            getSonDiseaseList(null,diseaseLevel.getDiseaseLevelList(),diseaseLevelListSon);
-        }else if(diseaseLevelList != null && diseaseLevelList.size() > 0){
-            for(DiseaseLevel info : diseaseLevelList){
-                getSonDiseaseList(info,null,diseaseLevelListSon);
+        if (diseaseLevel != null && diseaseLevel.getDiseaseLevelList() != null && diseaseLevel.getDiseaseLevelList().size() > 0) {
+            getSonDiseaseList(null, diseaseLevel.getDiseaseLevelList(), diseaseLevelListSon);
+        } else if (diseaseLevelList != null && diseaseLevelList.size() > 0) {
+            for (DiseaseLevel info : diseaseLevelList) {
+                getSonDiseaseList(info, null, diseaseLevelListSon);
             }
-        }else{
-            if(diseaseLevel != null && diseaseLevelListSon != null && diseaseLevelListSon.size() > 0){
+        } else {
+            if (diseaseLevel != null && diseaseLevelListSon != null && diseaseLevelListSon.size() > 0) {
                 diseaseLevel.setDiseaseLevelList(diseaseLevelListSon);
             }
         }
@@ -127,10 +132,14 @@ public class SerDiseaseServiceImpl implements SerDiseaseService {
      * @param level
      * @return
      */
-    private List<DiseaseLevel> selectByLevel(String date,Integer level,String docCode,String deptCode,Long userId) {
-        if(level == null){
+    private List<DiseaseLevel> selectByLevel(String date, Integer level, String docCode, String deptCode, Long userId) {
+        if (level == null) {
             level = 0;
         }
-        return serDiseaseMapper.selectByLevel(date,level,docCode,deptCode,null,userId);
+        if (level == 0) {
+            return serDiseaseMapper.selectByLevel(date, level, docCode, deptCode, null, userId);
+        } else {
+            return serDiseaseMapper.selectByLevelNoZBZ(date, level, docCode, deptCode, null, userId);
+        }
     }
 }

bsoft-api/src/main/java/com/bsoft/api/service/LoginService.java

@@ -2,6 +2,7 @@ package com.bsoft.api.service;
 
 import com.bsoft.api.model.DicOrg;
 import com.bsoft.api.model.SerDepartment;
+import com.bsoft.api.model.SysRole;
 import com.bsoft.api.model.SysUser;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -21,6 +22,8 @@ public interface LoginService {
         private String token;
         @ApiModelProperty("用户信息")
         private SysUser user;
+        @ApiModelProperty("用户角色信息")
+        private SysRole role;
         @ApiModelProperty("用户机构信息")
         private List<DicOrg> org;
         @ApiModelProperty("用户科室信息")
@@ -67,11 +70,20 @@ public interface LoginService {
             this.dept = dept;
         }
 
+        public SysRole getRole() {
+            return role;
+        }
+
+        public void setRole(SysRole role) {
+            this.role = role;
+        }
+
         @Override
         public String toString() {
             return "LoginInfo{" +
                     "token='" + token + '\'' +
                     ", user=" + user +
+                    ", role=" + role +
                     ", org=" + org +
                     ", dept=" + dept +
                     '}';

bsoft-api/src/main/resources/mapper/SerDiseaseMapper.xml

@@ -84,6 +84,32 @@
     <select id="selectByLevel" resultMap="DiseaseLevel">
         select DISTINCT d.ID, d.CREATE_DATE, d.CREATE_USERID, d.`STATE`, d.MDC_CODE, d.MDC_NAME, d.`DATE`,d.MDC_NUM,
         d.PARENT_ID, d.`LEVEL`, d.ORG_ID, d.ORG_NAME
+        from SER_DISEASE d
+        join SER_DISEASE_DOC_RS rs on rs.MDC_CODE=d.MDC_CODE
+        join (select ZBZBM,KSBM,SUM(ZLS) as ZLS
+        from val_block_values_1_5_2
+        group by ZBZBM,KSBM) val on val.ZBZBM = d.MDC_CODE and val.KSBM=rs.DEPT_CODE
+        where 1 = 1 and STATE=1
+        <if test="level!=null">
+            and d.`LEVEL` = #{level,jdbcType=DECIMAL}
+        </if>
+        <if test="deptCode!=null">
+            and rs.DEPT_CODE = #{deptCode,jdbcType=VARCHAR}
+        </if>
+        <if test="deptCode==null">
+            and EXISTS(select o2.ORG_CODE as DEPT_CODE
+            from SYS_USER_ORG_RS rs2
+            join DIC_ORG o2 on o2.id = rs2.ORG_ID and rs2.STATE = 1
+            where o2.STATE = 1
+            and rs2.USER_ID = #{userId,jdbcType=DECIMAL}
+            and o2.ORG_CODE = rs.DEPT_CODE
+            )
+        </if>
+        order by val.ZLS desc
+    </select>
+    <select id="selectByLevelNoZBZ" resultMap="DiseaseLevel">
+        select DISTINCT d.ID, d.CREATE_DATE, d.CREATE_USERID, d.`STATE`, d.MDC_CODE, d.MDC_NAME, d.`DATE`,d.MDC_NUM,
+        d.PARENT_ID, d.`LEVEL`, d.ORG_ID, d.ORG_NAME
         from SER_DISEASE d,SER_DISEASE_DOC_RS rs
         where 1 = 1 and STATE=1 and rs.MDC_CODE=d.MDC_CODE
         <if test="level!=null">
@@ -106,14 +132,37 @@
     <select id="selectByParentId" resultMap="DiseaseLevel">
         select DISTINCT d.ID, d.CREATE_DATE, d.CREATE_USERID, d.`STATE`, d.MDC_CODE, d.MDC_NAME, d.`DATE`,d.MDC_NUM,
         d.PARENT_ID, d.`LEVEL`, d.ORG_ID, d.ORG_NAME
-        from SER_DISEASE d,SER_DISEASE_DOC_RS rs
-        where 1 = 1 and STATE=1 and STATE=1 and rs.MDC_CODE=d.MDC_CODE
+        from SER_DISEASE d
+        join SER_DISEASE_DOC_RS rs on rs.MDC_CODE=d.MDC_CODE
+        join (select ZBZBM,KSBM,SUM(ZLS) as ZLS
+        from val_block_values_1_5_2
+        group by ZBZBM,KSBM) val on val.ZBZBM = d.MDC_CODE and val.KSBM=rs.DEPT_CODE
+        where 1 = 1 and STATE=1 and STATE=1
         <if test="parentId!=null">
             and d.PARENT_ID = #{parentId,jdbcType=DECIMAL}
         </if>
         <if test="deptCode!=null">
             and rs.DEPT_CODE=#{deptCode,jdbcType=VARCHAR}
         </if>
+        <if test="deptCode==null">
+            and EXISTS(select o2.ORG_CODE as DEPT_CODE
+            from SYS_USER_ORG_RS rs2
+            join DIC_ORG o2 on o2.id = rs2.ORG_ID and rs2.STATE = 1
+            where o2.STATE = 1
+            and rs2.USER_ID = #{userId,jdbcType=DECIMAL}
+            and o2.ORG_CODE = rs.DEPT_CODE
+            )
+        </if>
+        order by val.ZLS desc
+    </select>
+    <select id="selectByParentIdNoZbz" resultMap="DiseaseLevel">
+        select DISTINCT d.ID, d.CREATE_DATE, d.CREATE_USERID, d.`STATE`, d.MDC_CODE, d.MDC_NAME, d.`DATE`,d.MDC_NUM,
+        d.PARENT_ID, d.`LEVEL`, d.ORG_ID, d.ORG_NAME
+        from SER_DISEASE d
+        where 1 = 1 and STATE=1 and STATE=1
+        <if test="parentId!=null">
+            and d.PARENT_ID = #{parentId,jdbcType=DECIMAL}
+        </if>
         order by d.MDC_NUM
     </select>
     <select id="selectParentById" resultMap="DiseaseLevel">
@@ -124,17 +173,27 @@
             and id=(select PARENT_ID from SER_DISEASE where id = #{diseaseId,jdbcType=DECIMAL} )
         </if>
     </select>
+    <!--    <select id="selectSonById" resultMap="DiseaseLevel">-->
+    <!--        select DISTINCT d.ID, d.CREATE_DATE, d.CREATE_USERID, d.STATE, d.MDC_CODE, d.MDC_NAME, d.`DATE`,d.MDC_NUM,-->
+    <!--        d.PARENT_ID, d.`LEVEL`, d.ORG_ID, d.ORG_NAME-->
+    <!--        from SER_DISEASE d,SER_DISEASE_DOC_RS rs-->
+    <!--        where 1 = 1 and STATE=1 and STATE=1 and rs.MDC_CODE=d.MDC_CODE-->
+    <!--        <if test="diseaseId!=null">-->
+    <!--            and d.PARENT_ID=#{diseaseId,jdbcType=DECIMAL}-->
+    <!--        </if>-->
+    <!--        <if test="deptCode!=null">-->
+    <!--            and rs.DEPT_CODE=#{deptCode,jdbcType=VARCHAR}-->
+    <!--        </if>-->
+    <!--        order by d.MDC_NUM-->
+    <!--    </select>    -->
     <select id="selectSonById" resultMap="DiseaseLevel">
         select DISTINCT d.ID, d.CREATE_DATE, d.CREATE_USERID, d.STATE, d.MDC_CODE, d.MDC_NAME, d.`DATE`,d.MDC_NUM,
         d.PARENT_ID, d.`LEVEL`, d.ORG_ID, d.ORG_NAME
-        from SER_DISEASE d,SER_DISEASE_DOC_RS rs
-        where 1 = 1 and STATE=1 and STATE=1 and rs.MDC_CODE=d.MDC_CODE
+        from SER_DISEASE d
+        where 1 = 1 and STATE=1 and STATE=1
         <if test="diseaseId!=null">
             and d.PARENT_ID=#{diseaseId,jdbcType=DECIMAL}
         </if>
-        <if test="deptCode!=null">
-            and rs.DEPT_CODE=#{deptCode,jdbcType=VARCHAR}
-        </if>
         order by d.MDC_NUM
     </select>
 </mapper>
\ No newline at end of file

bsoft-api/src/main/resources/mapper/SysRoleMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.bsoft.api.mapper.SysRoleMapper">
-  <resultMap id="BaseResultMap" type="com.bsoft.api.model.SysRole">
-    <id column="ID" jdbcType="DECIMAL" property="id" />
-    <result column="CREATE_DATE" jdbcType="TIMESTAMP" property="createDate" />
-    <result column="CREATE_USERID" jdbcType="DECIMAL" property="createUserid" />
-    <result column="STATE" jdbcType="DECIMAL" property="state" />
-    <result column="ROLE_NAME" jdbcType="VARCHAR" property="roleName" />
-    <result column="ROLE_CODE" jdbcType="DECIMAL" property="roleCode" />
-  </resultMap>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
-    delete from SYS_ROLE
-    where ID = #{id,jdbcType=DECIMAL}
-  </delete>
-  <insert id="insert" parameterType="com.bsoft.api.model.SysRole">
-    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
-      SELECT LAST_INSERT_ID()
-    </selectKey>
-    insert into SYS_ROLE (CREATE_DATE, CREATE_USERID, `STATE`,
-      ROLE_NAME, ROLE_CODE)
-    values (#{createDate,jdbcType=TIMESTAMP}, #{createUserid,jdbcType=DECIMAL}, #{state,jdbcType=DECIMAL}, 
-      #{roleName,jdbcType=VARCHAR}, #{roleCode,jdbcType=DECIMAL})
-  </insert>
-  <update id="updateByPrimaryKey" parameterType="com.bsoft.api.model.SysRole">
-    update SYS_ROLE
-    set CREATE_DATE = #{createDate,jdbcType=TIMESTAMP},
-      CREATE_USERID = #{createUserid,jdbcType=DECIMAL},
-      `STATE` = #{state,jdbcType=DECIMAL},
-      ROLE_NAME = #{roleName,jdbcType=VARCHAR},
-      ROLE_CODE = #{roleCode,jdbcType=DECIMAL}
-    where ID = #{id,jdbcType=DECIMAL}
-  </update>
-  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
-    select ID, CREATE_DATE, CREATE_USERID, `STATE`, ROLE_NAME, ROLE_CODE
-    from SYS_ROLE
-    where ID = #{id,jdbcType=DECIMAL}
-  </select>
-  <select id="selectAll" resultMap="BaseResultMap">
-    select ID, CREATE_DATE, CREATE_USERID, `STATE`, ROLE_NAME, ROLE_CODE
-    from SYS_ROLE
-  </select>
+    <resultMap id="BaseResultMap" type="com.bsoft.api.model.SysRole">
+        <id column="ID" jdbcType="DECIMAL" property="id"/>
+        <result column="CREATE_DATE" jdbcType="TIMESTAMP" property="createDate"/>
+        <result column="CREATE_USERID" jdbcType="DECIMAL" property="createUserid"/>
+        <result column="STATE" jdbcType="DECIMAL" property="state"/>
+        <result column="ROLE_NAME" jdbcType="VARCHAR" property="roleName"/>
+        <result column="ROLE_CODE" jdbcType="DECIMAL" property="roleCode"/>
+    </resultMap>
+    <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
+        delete
+        from SYS_ROLE
+        where ID = #{id,jdbcType=DECIMAL}
+    </delete>
+    <insert id="insert" parameterType="com.bsoft.api.model.SysRole">
+        <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
+            SELECT LAST_INSERT_ID()
+        </selectKey>
+        insert into SYS_ROLE (CREATE_DATE, CREATE_USERID, `STATE`,
+        ROLE_NAME, ROLE_CODE)
+        values (#{createDate,jdbcType=TIMESTAMP}, #{createUserid,jdbcType=DECIMAL}, #{state,jdbcType=DECIMAL},
+        #{roleName,jdbcType=VARCHAR}, #{roleCode,jdbcType=DECIMAL})
+    </insert>
+    <update id="updateByPrimaryKey" parameterType="com.bsoft.api.model.SysRole">
+        update SYS_ROLE
+        set CREATE_DATE   = #{createDate,jdbcType=TIMESTAMP},
+            CREATE_USERID = #{createUserid,jdbcType=DECIMAL},
+            `STATE`       = #{state,jdbcType=DECIMAL},
+            ROLE_NAME     = #{roleName,jdbcType=VARCHAR},
+            ROLE_CODE     = #{roleCode,jdbcType=DECIMAL}
+        where ID = #{id,jdbcType=DECIMAL}
+    </update>
+    <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
+        select ID, CREATE_DATE, CREATE_USERID, `STATE`, ROLE_NAME, ROLE_CODE
+        from SYS_ROLE
+        where ID = #{id,jdbcType=DECIMAL}
+    </select>
+    <select id="selectAll" resultMap="BaseResultMap">
+        select ID, CREATE_DATE, CREATE_USERID, `STATE`, ROLE_NAME, ROLE_CODE
+        from SYS_ROLE
+    </select>
+    <select id="selectByUser" resultMap="BaseResultMap">
+        select a.*
+        from sys_role a
+                 join sys_user_role_rs b on a.ID = b.ROLE_ID and b.STATE = 1
+        where b.USER_ID = #{userId,jdbcType=DECIMAL}
+          and a.STATE = 1
+    </select>
 </mapper>
\ No newline at end of file