部门资质bug修改

jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/depadminlx/controller/DepadminlxController.java

@@ -40,7 +40,6 @@ import com.alibaba.fastjson.JSON;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.jeecg.common.aspect.annotation.AutoLog;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
 
  /**
  * @Description: 单位基本情况联系人
@@ -88,7 +87,6 @@ public class DepadminlxController extends JeecgController<Depadminlx, IDepadminl
 	 */
 	@AutoLog(value = "单位基本情况联系人-添加")
 	@ApiOperation(value="单位基本情况联系人-添加", notes="单位基本情况联系人-添加")
-	@RequiresPermissions("depadminlx:depadminlx:add")
 	@PostMapping(value = "/add")
 	public Result<String> add(@RequestBody Depadminlx depadminlx) {
 		LoginUser user= (LoginUser) SecurityUtils.getSubject().getPrincipal();
@@ -107,7 +105,6 @@ public class DepadminlxController extends JeecgController<Depadminlx, IDepadminl
 	 */
 	@AutoLog(value = "单位基本情况联系人-编辑")
 	@ApiOperation(value="单位基本情况联系人-编辑", notes="单位基本情况联系人-编辑")
-	@RequiresPermissions("depadminlx:depadminlx:edit")
 	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
 	public Result<String> edit(@RequestBody Depadminlx depadminlx) {
 		depadminlxService.updateById(depadminlx);
@@ -122,7 +119,6 @@ public class DepadminlxController extends JeecgController<Depadminlx, IDepadminl
 	 */
 	@AutoLog(value = "单位基本情况联系人-通过id删除")
 	@ApiOperation(value="单位基本情况联系人-通过id删除", notes="单位基本情况联系人-通过id删除")
-	@RequiresPermissions("depadminlx:depadminlx:delete")
 	@DeleteMapping(value = "/delete")
 	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
 		depadminlxService.removeById(id);
@@ -137,7 +133,6 @@ public class DepadminlxController extends JeecgController<Depadminlx, IDepadminl
 	 */
 	@AutoLog(value = "单位基本情况联系人-批量删除")
 	@ApiOperation(value="单位基本情况联系人-批量删除", notes="单位基本情况联系人-批量删除")
-	@RequiresPermissions("depadminlx:depadminlx:deleteBatch")
 	@DeleteMapping(value = "/deleteBatch")
 	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
 		this.depadminlxService.removeByIds(Arrays.asList(ids.split(",")));
@@ -167,7 +162,6 @@ public class DepadminlxController extends JeecgController<Depadminlx, IDepadminl
     * @param request
     * @param depadminlx
     */
-    @RequiresPermissions("depadminlx:depadminlx:exportXls")
     @RequestMapping(value = "/exportXls")
     public ModelAndView exportXls(HttpServletRequest request, Depadminlx depadminlx) {
         return super.exportXls(request, depadminlx, Depadminlx.class, "单位基本情况联系人");
@@ -180,7 +174,6 @@ public class DepadminlxController extends JeecgController<Depadminlx, IDepadminl
     * @param response
     * @return
     */
-    @RequiresPermissions("depadminlx:depadminlx:importExcel")
     @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
     public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
         return super.importExcel(request, response, Depadminlx.class);

jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/depfile/controller/DepfileController.java

@@ -41,7 +41,6 @@ import com.alibaba.fastjson.JSON;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.jeecg.common.aspect.annotation.AutoLog;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
 
  /**
  * @Description: 单位技术研究资质情况
@@ -92,7 +91,6 @@ public class DepfileController extends JeecgController<Depfile, IDepfileService>
 	 */
 	@AutoLog(value = "单位技术研究资质情况-添加")
 	@ApiOperation(value="单位技术研究资质情况-添加", notes="单位技术研究资质情况-添加")
-	@RequiresPermissions("depfile:depfile:add")
 	@PostMapping(value = "/add")
 	public Result<String> add(@RequestBody Depfile depfile) {
 		LoginUser user= (LoginUser) SecurityUtils.getSubject().getPrincipal();
@@ -111,7 +109,6 @@ public class DepfileController extends JeecgController<Depfile, IDepfileService>
 	 */
 	@AutoLog(value = "单位技术研究资质情况-编辑")
 	@ApiOperation(value="单位技术研究资质情况-编辑", notes="单位技术研究资质情况-编辑")
-	@RequiresPermissions("depfile:depfile:edit")
 	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
 	public Result<String> edit(@RequestBody Depfile depfile) {
 		depfileService.updateById(depfile);
@@ -126,7 +123,6 @@ public class DepfileController extends JeecgController<Depfile, IDepfileService>
 	 */
 	@AutoLog(value = "单位技术研究资质情况-通过id删除")
 	@ApiOperation(value="单位技术研究资质情况-通过id删除", notes="单位技术研究资质情况-通过id删除")
-	@RequiresPermissions("depfile:depfile:delete")
 	@DeleteMapping(value = "/delete")
 	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
 		depfileService.removeById(id);
@@ -141,7 +137,6 @@ public class DepfileController extends JeecgController<Depfile, IDepfileService>
 	 */
 	@AutoLog(value = "单位技术研究资质情况-批量删除")
 	@ApiOperation(value="单位技术研究资质情况-批量删除", notes="单位技术研究资质情况-批量删除")
-	@RequiresPermissions("depfile:depfile:deleteBatch")
 	@DeleteMapping(value = "/deleteBatch")
 	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
 		this.depfileService.removeByIds(Arrays.asList(ids.split(",")));
@@ -171,7 +166,6 @@ public class DepfileController extends JeecgController<Depfile, IDepfileService>
     * @param request
     * @param depfile
     */
-    @RequiresPermissions("depfile:depfile:exportXls")
     @RequestMapping(value = "/exportXls")
     public ModelAndView exportXls(HttpServletRequest request, Depfile depfile) {
         return super.exportXls(request, depfile, Depfile.class, "单位技术研究资质情况");
@@ -184,7 +178,6 @@ public class DepfileController extends JeecgController<Depfile, IDepfileService>
     * @param response
     * @return
     */
-    @RequiresPermissions("depfile:depfile:importExcel")
     @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
     public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
         return super.importExcel(request, response, Depfile.class);

jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/depsbncz/controller/DepsbnczController.java

@@ -41,7 +41,7 @@ import com.alibaba.fastjson.JSON;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.jeecg.common.aspect.annotation.AutoLog;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
+
 
  /**
  * @Description: 上年度(末)主要财务数据
@@ -91,7 +91,6 @@ public class DepsbnczController extends JeecgController<Depsbncz, IDepsbnczServi
 	 */
 	@AutoLog(value = "上年度(末)主要财务数据-添加")
 	@ApiOperation(value="上年度(末)主要财务数据-添加", notes="上年度(末)主要财务数据-添加")
-	@RequiresPermissions("depsbncz:depsbncz:add")
 	@PostMapping(value = "/add")
 	public Result<String> add(@RequestBody Depsbncz depsbncz) {
 		LoginUser user= (LoginUser) SecurityUtils.getSubject().getPrincipal();
@@ -110,7 +109,6 @@ public class DepsbnczController extends JeecgController<Depsbncz, IDepsbnczServi
 	 */
 	@AutoLog(value = "上年度(末)主要财务数据-编辑")
 	@ApiOperation(value="上年度(末)主要财务数据-编辑", notes="上年度(末)主要财务数据-编辑")
-	@RequiresPermissions("depsbncz:depsbncz:edit")
 	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
 	public Result<String> edit(@RequestBody Depsbncz depsbncz) {
 		depsbnczService.updateById(depsbncz);
@@ -125,7 +123,6 @@ public class DepsbnczController extends JeecgController<Depsbncz, IDepsbnczServi
 	 */
 	@AutoLog(value = "上年度(末)主要财务数据-通过id删除")
 	@ApiOperation(value="上年度(末)主要财务数据-通过id删除", notes="上年度(末)主要财务数据-通过id删除")
-	@RequiresPermissions("depsbncz:depsbncz:delete")
 	@DeleteMapping(value = "/delete")
 	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
 		depsbnczService.removeById(id);
@@ -140,7 +137,6 @@ public class DepsbnczController extends JeecgController<Depsbncz, IDepsbnczServi
 	 */
 	@AutoLog(value = "上年度(末)主要财务数据-批量删除")
 	@ApiOperation(value="上年度(末)主要财务数据-批量删除", notes="上年度(末)主要财务数据-批量删除")
-	@RequiresPermissions("depsbncz:depsbncz:deleteBatch")
 	@DeleteMapping(value = "/deleteBatch")
 	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
 		this.depsbnczService.removeByIds(Arrays.asList(ids.split(",")));
@@ -170,7 +166,6 @@ public class DepsbnczController extends JeecgController<Depsbncz, IDepsbnczServi
     * @param request
     * @param depsbncz
     */
-    @RequiresPermissions("depsbncz:depsbncz:exportXls")
     @RequestMapping(value = "/exportXls")
     public ModelAndView exportXls(HttpServletRequest request, Depsbncz depsbncz) {
         return super.exportXls(request, depsbncz, Depsbncz.class, "上年度(末)主要财务数据");
@@ -183,7 +178,6 @@ public class DepsbnczController extends JeecgController<Depsbncz, IDepsbnczServi
     * @param response
     * @return
     */
-    @RequiresPermissions("depsbncz:depsbncz:importExcel")
     @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
     public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
         return super.importExcel(request, response, Depsbncz.class);

jeecgboot-vue3/src/views/depadminlx/DepadminlxList.vue

@@ -29,7 +29,7 @@
     <BasicTable @register="registerTable" :rowSelection="rowSelection">
       <!--插槽:table标题-->
       <template #tableTitle>
-        <a-button type="primary" v-auth="'depadminlx:depadminlx:add'"  @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
+        <a-button type="primary"   @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
         <a-button  type="primary" v-auth="'depadminlx:depadminlx:exportXls'" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
         <j-upload-button  type="primary" v-auth="'depadminlx:depadminlx:importExcel'"  preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
         <a-dropdown v-if="selectedRowKeys.length > 0">
@@ -136,7 +136,7 @@
     registerModal.value.disableSubmit = false;
     registerModal.value.add();
   }
-  
+
   /**
    * 编辑事件
    */
@@ -144,7 +144,7 @@
     registerModal.value.disableSubmit = false;
     registerModal.value.edit(record);
   }
-   
+
   /**
    * 详情
    */
@@ -152,28 +152,28 @@
     registerModal.value.disableSubmit = true;
     registerModal.value.edit(record);
   }
-   
+
   /**
    * 删除事件
    */
   async function handleDelete(record) {
     await deleteOne({ id: record.id }, handleSuccess);
   }
-   
+
   /**
    * 批量删除事件
    */
   async function batchHandleDelete() {
     await batchDelete({ ids: selectedRowKeys.value }, handleSuccess);
   }
-   
+
   /**
    * 成功回调
    */
   function handleSuccess() {
     (selectedRowKeys.value = []) && reload();
   }
-   
+
   /**
    * 操作栏
    */
@@ -182,11 +182,11 @@
       {
         label: '编辑',
         onClick: handleEdit.bind(null, record),
-        auth: 'depadminlx:depadminlx:edit'
+
       },
     ];
   }
-   
+
   /**
    * 下拉操作栏
    */
@@ -202,7 +202,7 @@
           confirm: handleDelete.bind(null, record),
           placement: 'topLeft',
         },
-        auth: 'depadminlx:depadminlx:delete'
+
       }
     ]
   }
@@ -213,7 +213,7 @@
   function searchQuery() {
     reload();
   }
-  
+
   /**
    * 重置
    */
@@ -223,7 +223,7 @@
     //刷新数据
     reload();
   }
-  
+
 
 
 

jeecgboot-vue3/src/views/depadminlx/components/DepadminlxForm.vue

@@ -49,11 +49,11 @@
 								<a-input v-model:value="formData.dwlxryx" placeholder="请输入单位联系人邮箱"  allow-clear ></a-input>
 							</a-form-item>
 						</a-col>
-						<a-col :span="24">
+<!--						<a-col :span="24">
 							<a-form-item label="部门" v-bind="validateInfos.depid" id="DepadminlxForm-depid" name="depid">
 								<j-search-select v-model:value="formData.depid" dict="sys_depart,depart_name,id"  allow-clear />
 							</a-form-item>
-						</a-col>
+						</a-col>-->
           </a-row>
         </a-form>
       </template>
@@ -80,16 +80,16 @@
   const emit = defineEmits(['register', 'ok']);
   const formData = reactive<Record<string, any>>({
     id: '',
-    bzs: '',   
+    bzs: '',
-    zzzgrs: '',   
+    zzzgrs: '',
-    zjzcysyjrys: '',   
+    zjzcysyjrys: '',
-    dwlxrxm: '',   
+    dwlxrxm: '',
-    dwlxrzc: '',   
+    dwlxrzc: '',
-    dwlxrzw: '',   
+    dwlxrzw: '',
-    dwlxrdh: '',   
+    dwlxrdh: '',
-    dwlxrsj: '',   
+    dwlxrsj: '',
-    dwlxryx: '',   
+    dwlxryx: '',
-    depid: '',   
+    depid: '',
   });
   const { createMessage } = useMessage();
   const labelCol = ref<any>({ xs: { span: 24 }, sm: { span: 5 } });
@@ -114,7 +114,7 @@
     return props.formDisabled;
   });
 
-  
+
   /**
    * 新增
    */

jeecgboot-vue3/src/views/depfile/DepfileList.vue

@@ -11,7 +11,7 @@
     <BasicTable @register="registerTable" :rowSelection="rowSelection">
       <!--插槽:table标题-->
       <template #tableTitle>
-        <a-button type="primary" v-auth="'depfile:depfile:add'"  @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
+        <a-button type="primary"   @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
         <a-button  type="primary" v-auth="'depfile:depfile:exportXls'" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
         <j-upload-button  type="primary" v-auth="'depfile:depfile:importExcel'"  preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
         <a-dropdown v-if="selectedRowKeys.length > 0">
@@ -121,7 +121,7 @@
     registerModal.value.disableSubmit = false;
     registerModal.value.add();
   }
-  
+
   /**
    * 编辑事件
    */
@@ -129,7 +129,7 @@
     registerModal.value.disableSubmit = false;
     registerModal.value.edit(record);
   }
-   
+
   /**
    * 详情
    */
@@ -137,28 +137,28 @@
     registerModal.value.disableSubmit = true;
     registerModal.value.edit(record);
   }
-   
+
   /**
    * 删除事件
    */
   async function handleDelete(record) {
     await deleteOne({ id: record.id }, handleSuccess);
   }
-   
+
   /**
    * 批量删除事件
    */
   async function batchHandleDelete() {
     await batchDelete({ ids: selectedRowKeys.value }, handleSuccess);
   }
-   
+
   /**
    * 成功回调
    */
   function handleSuccess() {
     (selectedRowKeys.value = []) && reload();
   }
-   
+
   /**
    * 操作栏
    */
@@ -167,11 +167,11 @@
       {
         label: '编辑',
         onClick: handleEdit.bind(null, record),
-        auth: 'depfile:depfile:edit'
+
       },
     ];
   }
-   
+
   /**
    * 下拉操作栏
    */
@@ -187,7 +187,7 @@
           confirm: handleDelete.bind(null, record),
           placement: 'topLeft',
         },
-        auth: 'depfile:depfile:delete'
+
       }
     ]
   }
@@ -198,7 +198,7 @@
   function searchQuery() {
     reload();
   }
-  
+
   /**
    * 重置
    */
@@ -208,7 +208,7 @@
     //刷新数据
     reload();
   }
-  
+
 
 
 

jeecgboot-vue3/src/views/depfile/components/DepfileForm.vue

@@ -4,11 +4,11 @@
       <template #detail>
         <a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol" name="DepfileForm">
           <a-row>
-						<a-col :span="24">
+<!--						<a-col :span="24">
 							<a-form-item label="部门名称" v-bind="validateInfos.depid" id="DepfileForm-depid" name="depid">
 								<j-search-select v-model:value="formData.depid" dict="sys_depart,depart_name,id"  allow-clear />
 							</a-form-item>
-						</a-col>
+						</a-col>-->
 						<a-col :span="24">
 							<a-form-item label="名称" v-bind="validateInfos.filename" id="DepfileForm-filename" name="filename">
 								<a-input v-model:value="formData.filename" placeholder="请输入名称"  allow-clear ></a-input>
@@ -56,11 +56,11 @@
   const emit = defineEmits(['register', 'ok']);
   const formData = reactive<Record<string, any>>({
     id: '',
-    depid: '',   
+    depid: '',
-    filename: '',   
+    filename: '',
-    depnumber: '',   
+    depnumber: '',
-    rdtime: '',   
+    rdtime: '',
-    upfile: '',   
+    upfile: '',
   });
   const { createMessage } = useMessage();
   const labelCol = ref<any>({ xs: { span: 24 }, sm: { span: 5 } });
@@ -83,7 +83,7 @@
     return props.formDisabled;
   });
 
-  
+
   /**
    * 新增
    */

jeecgboot-vue3/src/views/depsbncz/DepsbnczList.vue

@@ -11,7 +11,7 @@
     <BasicTable @register="registerTable" :rowSelection="rowSelection">
       <!--插槽:table标题-->
       <template #tableTitle>
-        <a-button type="primary" v-auth="'depsbncz:depsbncz:add'"  @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
+        <a-button type="primary"   @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
         <a-button  type="primary" v-auth="'depsbncz:depsbncz:exportXls'" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
         <j-upload-button  type="primary" v-auth="'depsbncz:depsbncz:importExcel'"  preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
         <a-dropdown v-if="selectedRowKeys.length > 0">
@@ -116,7 +116,7 @@
     registerModal.value.disableSubmit = false;
     registerModal.value.add();
   }
-  
+
   /**
    * 编辑事件
    */
@@ -124,7 +124,7 @@
     registerModal.value.disableSubmit = false;
     registerModal.value.edit(record);
   }
-   
+
   /**
    * 详情
    */
@@ -132,28 +132,28 @@
     registerModal.value.disableSubmit = true;
     registerModal.value.edit(record);
   }
-   
+
   /**
    * 删除事件
    */
   async function handleDelete(record) {
     await deleteOne({ id: record.id }, handleSuccess);
   }
-   
+
   /**
    * 批量删除事件
    */
   async function batchHandleDelete() {
     await batchDelete({ ids: selectedRowKeys.value }, handleSuccess);
   }
-   
+
   /**
    * 成功回调
    */
   function handleSuccess() {
     (selectedRowKeys.value = []) && reload();
   }
-   
+
   /**
    * 操作栏
    */
@@ -162,11 +162,11 @@
       {
         label: '编辑',
         onClick: handleEdit.bind(null, record),
-        auth: 'depsbncz:depsbncz:edit'
+
       },
     ];
   }
-   
+
   /**
    * 下拉操作栏
    */
@@ -182,7 +182,7 @@
           confirm: handleDelete.bind(null, record),
           placement: 'topLeft',
         },
-        auth: 'depsbncz:depsbncz:delete'
+
       }
     ]
   }
@@ -193,7 +193,7 @@
   function searchQuery() {
     reload();
   }
-  
+
   /**
    * 重置
    */
@@ -203,7 +203,7 @@
     //刷新数据
     reload();
   }
-  
+
 
 
 

jeecgboot-vue3/src/views/depsbncz/components/DepsbnczForm.vue

@@ -4,11 +4,11 @@
       <template #detail>
         <a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol" name="DepsbnczForm">
           <a-row>
-						<a-col :span="24">
+<!--						<a-col :span="24">
 							<a-form-item label="部门" v-bind="validateInfos.depid" id="DepsbnczForm-depid" name="depid">
 								<j-search-select v-model:value="formData.depid" dict="sys_depart,depart_name,id"  allow-clear />
 							</a-form-item>
-						</a-col>
+						</a-col>-->
 						<a-col :span="24">
 							<a-form-item label="单位开办费" v-bind="validateInfos.dwkbf" id="DepsbnczForm-dwkbf" name="dwkbf">
 								<a-input v-model:value="formData.dwkbf" placeholder="请输入单位开办费"  allow-clear ></a-input>
@@ -85,17 +85,17 @@
   const emit = defineEmits(['register', 'ok']);
   const formData = reactive<Record<string, any>>({
     id: '',
-    depid: '',   
+    depid: '',
-    dwkbf: '',   
+    dwkbf: '',
-    zchj: '',   
+    zchj: '',
-    fzhj: '',   
+    fzhj: '',
-    jzc: '',   
+    jzc: '',
-    czbk: '',   
+    czbk: '',
-    czbkzxzc: '',   
+    czbkzxzc: '',
-    jysr: '',   
+    jysr: '',
-    jyzc: '',   
+    jyzc: '',
-    jyjy: '',   
+    jyjy: '',
-    nsze: '',   
+    nsze: '',
   });
   const { createMessage } = useMessage();
   const labelCol = ref<any>({ xs: { span: 24 }, sm: { span: 5 } });
@@ -118,7 +118,7 @@
     return props.formDisabled;
   });
 
-  
+
   /**
    * 新增
    */