登录用户控制、字典封存

src/main/java/org/springblade/bank/postchange/controller/PostChangeController.java

@@ -91,6 +91,10 @@ public class PostChangeController extends BladeController {
 	@ApiOperation(value = "分页", notes = "传入postChange")
 	public R<IPage<PostChangeVO>> page(PostChangeVO postChange, Query query) {
 		postChange.setCurrentuserId(AuthUtil.getUser().getUserId());
+		if (StringUtils.isNotBlank(postChange.getOrgNostr())){
+			List<String> orgNos = Func.toStrList(postChange.getOrgNostr());
+			postChange.setOrgNos(orgNos);
+		}
 		IPage<PostChangeVO> pages = postChangeService.selectPostChangePage(Condition.getPage(query), postChange);
 		return R.data(pages);
 	}

src/main/java/org/springblade/bank/postchange/mapper/PostChangeMapper.xml

@@ -46,8 +46,14 @@
             <if test="postChange.bankNo!=null">
                 AND bank_no = '${postChange.bankNo}'
             </if>
-            <if test="postChange.orgNo!=null">
+            <!--<if test="postChange.orgNo!=null">
                 AND org_no = '${postChange.orgNo}'
+            </if>-->
+            <if test="postChange.orgNos!=null">
+                AND org_no in
+                <foreach item="orgNo" collection="postChange.orgNos" separator="," open="(" close=")" index="">
+                    #{orgNo}
+                </foreach>
             </if>
             <if test="postChange.process!=null">
                 AND process = '${postChange.process}'

src/main/java/org/springblade/bank/postchange/vo/PostChangeVO.java

@@ -21,6 +21,8 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import io.swagger.annotations.ApiModel;
 
+import java.util.List;
+
 /**
  * 網點出納主管及專管員崗位表更記錄表视图实体类
  *
@@ -33,6 +35,8 @@ import io.swagger.annotations.ApiModel;
 public class PostChangeVO extends PostChange {
 	private static final long serialVersionUID = 1L;
 
+	private String orgNostr;
+	private List<String> orgNos;
 	private String effectiveDate_begin;
 	private String effectiveDate_end;
 

src/main/java/org/springblade/modules/system/controller/MenuController.java

@@ -26,6 +26,7 @@ import org.springblade.core.launch.constant.AppConstant;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.secure.BladeUser;
 import org.springblade.core.secure.annotation.PreAuth;
+import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tenant.annotation.NonDS;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.constant.RoleConstant;
@@ -39,6 +40,7 @@ import org.springblade.modules.system.vo.CheckedTreeVO;
 import org.springblade.modules.system.vo.GrantTreeVO;
 import org.springblade.modules.system.vo.MenuVO;
 import org.springblade.modules.system.wrapper.MenuWrapper;
+import org.springframework.util.Assert;
 import org.springframework.web.bind.annotation.*;
 import springfox.documentation.annotations.ApiIgnore;
 
@@ -178,6 +180,7 @@ public class MenuController extends BladeController {
 	@ApiOperationSupport(order = 8)
 	@ApiOperation(value = "前端菜单数据", notes = "前端菜单数据")
 	public R<List<MenuVO>> routes(BladeUser user, Long topMenuId) {
+		Assert.isTrue(!"loginUser".equals(AuthUtil.getUserRole()), "您仍未被配置相關系統權限，請聯係系統管理員進行用戶配置");
 		List<MenuVO> list = menuService.routes((user == null) ? null : user.getRoleId(), topMenuId);
 		return R.data(list);
 	}

src/main/java/org/springblade/modules/system/mapper/DictMapper.xml

@@ -14,6 +14,7 @@
         <result column="bank_no" property="bankNo"/>
         <result column="org_no" property="orgNo"/>
         <result column="is_deleted" property="isDeleted"/>
+        <result column="is_sealed" property="isSealed"/>
     </resultMap>
 
     <resultMap id="treeNodeResultMap" type="org.springblade.core.tool.node.TreeNode">
@@ -42,7 +43,7 @@
     </select>-->
 
     <select id="getList" resultMap="dictResultMap">
-        select id, parent_id, code, dict_key, dict_value, sort, remark from blade_dict where code = #{param1} and parent_id > 0 and is_sealed = 0 and is_deleted = 0 order by sort
+        select id, parent_id, code, dict_key, dict_value, sort, remark, is_sealed from blade_dict where code = #{param1} and parent_id > 0 and is_deleted = 0 order by sort
     </select>
 
     <select id="tree" resultMap="treeNodeResultMap">