Merge branch 'yonge' of http://git.dayaedu.com/yonge/mec into yonge

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/service/impl/SysMenuServiceImpl.java

@@ -45,7 +45,6 @@ public class SysMenuServiceImpl extends BaseServiceImpl<Integer, SysMenu>  imple
 			sysMenus = sysMenuDao.findByParentId(menuQueryInfo.getParentId(),menuQueryInfo.getDelFlag(),menuQueryInfo.getUserId(),menuQueryInfo.getHid());
 		}
 		for (SysMenu menu:sysMenus) {
-			menu.setParentPermission(menu.getPermission());
 			menu = getTree(menu,menuQueryInfo.getDelFlag(),menuQueryInfo.getUserId(),menuQueryInfo.getHid());
 		}
 		return sysMenus;
@@ -66,7 +65,6 @@ public class SysMenuServiceImpl extends BaseServiceImpl<Integer, SysMenu>  imple
 			menu.setSysMenus(sysMenus);
 			//遍历子节点....
 			for (SysMenu sysMenu : sysMenus) {
-				sysMenu.setParentPermission(menu.getParentPermission());
 				getTree(sysMenu,delFlag,userId,hid);
 			}
 		}

mec-auth/mec-auth-server/src/main/resources/config/mybatis/SysMenuMapper.xml

@@ -10,6 +10,7 @@
         <result column="id_" property="id"/>
         <result column="name_" property="name"/>
         <result column="permission_" property="permission"/>
+        <result column="parent_permission_" property="parentPermission"/>
         <result column="path_" property="path"/>
         <result column="parent_id_" property="parentId"/>
         <result column="icon_" property="icon"/>
@@ -38,8 +39,8 @@
     <insert id="insert" parameterType="com.ym.mec.auth.api.entity.SysMenu" useGeneratedKeys="true" keyColumn="id"
             keyProperty="id">
         INSERT INTO sys_menu
-        (id_,name_,permission_,path_,parent_id_,icon_,component_,sort_,type_,create_time_,update_time_,hidden_)
-        VALUES(#{id},#{name},#{permission},#{path},#{parentId},#{icon},#{component},#{sort},#{type},now(),now(),#{hid})
+        (id_,name_,permission_,path_,parent_id_,icon_,component_,sort_,type_,create_time_,update_time_,hidden_,parent_permission_)
+        VALUES(#{id},#{name},#{permission},#{path},#{parentId},#{icon},#{component},#{sort},#{type},now(),now(),#{hid},#{parentPermission})
     </insert>
 
     <!-- 根据主键查询一条记录 -->
@@ -58,6 +59,9 @@
             <if test="permission != null">
                 permission_ = #{permission},
             </if>
+            <if test="parentPermission != null">
+                parent_permission_ = #{parentPermission},
+            </if>
             <if test="path != null">
                 path_ = #{path},
             </if>

mec-student/src/main/java/com/ym/mec/student/controller/SporadicChargeInfoController.java

@@ -79,7 +79,7 @@ public class SporadicChargeInfoController extends BaseController {
             if (sysUser == null || sysUser.getId() == null) {
                 return failed("用户不存在");
             }
-            if (sysUser.getUserType() != SysUserType.STUDENT) {
+            if (!sysUser.getUserType().contains("STUDENT")) {
                 return failed("用户信息异常");
             }
             sporadicPayDto.setUserId(sysUser.getId());
@@ -106,10 +106,10 @@ public class SporadicChargeInfoController extends BaseController {
         if (sysUser == null || sysUser.getId() == null) {
             return failed("请先登录");
         }
-        if (sysUser.getOrganId() == null || sysUser.getOrganId().isEmpty()) {
+        if (sysUser.getOrganId() == null) {
             return failed("用户信息有误，没有分部信息");
         }
-        Integer organId = Integer.parseInt(sysUser.getOrganId());
+        Integer organId = sysUser.getOrganId();
 
         if (type == null || type <= 0) {
             return failed("参数不合法");