快速构建数据填写权限调整

src/main/java/org/springblade/bank/autodata/controller/AutoDataController.java

@@ -16,30 +16,34 @@
  */
 package org.springblade.bank.autodata.controller;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
-import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import lombok.AllArgsConstructor;
-import javax.validation.Valid;
-
+import org.springblade.bank.autodata.entity.AutoData;
+import org.springblade.bank.autodata.service.IAutoDataService;
+import org.springblade.bank.autodata.vo.AutoDataVO;
+import org.springblade.bank.autodata.wrapper.AutoDataWrapper;
 import org.springblade.bank.autostruct.entity.AutoStruct;
 import org.springblade.bank.autostruct.service.IAutoStructService;
+import org.springblade.common.cache.UserCache;
+import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.BladeUser;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.BeanUtil;
 import org.springblade.core.tool.utils.Func;
+import org.springblade.modules.system.entity.User;
 import org.springframework.util.Assert;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.RequestParam;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.springblade.bank.autodata.entity.AutoData;
-import org.springblade.bank.autodata.vo.AutoDataVO;
-import org.springblade.bank.autodata.wrapper.AutoDataWrapper;
-import org.springblade.bank.autodata.service.IAutoDataService;
-import org.springblade.core.boot.ctrl.BladeController;
+
+import javax.validation.Valid;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  *  控制器
@@ -102,6 +106,18 @@ public class AutoDataController extends BladeController {
 		//是否管理員角色
 		autoData.setIsManageRole(isManageRole);
 		IPage<AutoDataVO> pages = autoDataService.selectAutoDataPage(Condition.getPage(query), autoData);
+		List<AutoDataVO> records = pages.getRecords();
+		List<AutoDataVO> list = new ArrayList<>();
+		for (int i = 0; i < records.size(); i++) {
+			AutoDataVO autoDataVO = new AutoDataVO();
+			BeanUtil.copyProperties(records.get(i), autoDataVO);
+			User createUser = UserCache.getUser(autoDataVO.getCreateUser());
+			if (createUser != null){
+				autoDataVO.setCreateUserName(createUser.getName());
+			}
+			list.add(autoDataVO);
+		}
+		pages.setRecords(list);
 		return R.data(pages);
 	}
 

src/main/java/org/springblade/bank/autodata/mapper/AutoDataMapper.xml

@@ -54,21 +54,21 @@
             <if test="autoData.isManageRole != true">
                 and td.create_dept = '${autoData.currentDeptId}'
             </if>
-            <if test="autoData.params1!=null">
-                AND td.params1 like '${autoData.params1}%'
-            </if>
-            <if test="autoData.params2!=null">
-                AND td.params2 like '${autoData.params2}%'
-            </if>
-            <if test="autoData.params3!=null">
-                AND td.params3 like '${autoData.params3}%'
-            </if>
             <if test="autoData.params4!=null">
                 AND td.params4 like '${autoData.params4}%'
             </if>
             <if test="autoData.params5!=null">
                 AND td.params5 like '${autoData.params5}%'
             </if>
+            <if test="autoData.params6!=null">
+                AND td.params6 like '${autoData.params6}%'
+            </if>
+            <if test="autoData.params7!=null">
+                AND td.params7 like '${autoData.params7}%'
+            </if>
+            <if test="autoData.params8!=null">
+                AND td.params8 like '${autoData.params8}%'
+            </if>
         </if>
         ORDER BY td.create_time DESC
     </select>

src/main/java/org/springblade/bank/autodata/vo/AutoDataVO.java

@@ -36,4 +36,6 @@ public class AutoDataVO extends AutoData {
 	private String currentDeptId;
 	private Boolean isManageRole;
 
+	private String createUserName;
+
 }

src/main/java/org/springblade/bank/autostruct/controller/AutoStructController.java

@@ -116,7 +116,7 @@ public class AutoStructController extends BladeController {
 				String roleId = userRoles[i];
 				isManageRole = isManageRole || item.getManageRoleId().contains(roleId);
 				if (StringUtil.isNotBlank(tableRoleIds)){
-					roleFlag = roleFlag && tableRoleIds.contains(roleId);
+					roleFlag = roleFlag || tableRoleIds.contains(roleId);
 				}
 			}
 			if (StringUtil.isNotBlank(tableRoleIds)){