执法事项相关

lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/linkage/add.html

@@ -21,7 +21,7 @@
 			<label class="col-sm-3 control-label is-required">节点名称：</label>
 
 			<div class="col-sm-6">
-				<input class="form-control" type="text" name="deptName" id="title" required>
+				<input class="form-control" type="text" name="title" id="title" required>
 			</div>
 			<div class="col-sm-2">
 				<input class="form-control" type="text" name="srot" required>
@@ -78,7 +78,7 @@
 
 	function submitHandler() {
 		if ($.validate.form()) {
-			$.operate.save(prefix + "/edit", $('#form-dept-edit').serialize());
+			$.operate.save(prefix + "/add", $('#form-dept-edit').serialize());
 		}
 	}
 

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/LinkageDictController.java

@@ -2,11 +2,12 @@ package com.zdxt.code.controller;
 
 import java.util.List;
 
+import com.zdxt.auth.framework.web.controller.BaseController;
+import com.zdxt.auth.framework.web.domain.AjaxResult;
 import com.zdxt.code.domain.LinkageDict;
 import com.zdxt.code.service.ILinkageDictService;
 import com.zdxt.common.ZDResponse;
 import com.zdxt.common.Ztree;
-import com.zdxt.common.controller.BaseController;
 import com.zdxt.common.util.StringUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -100,9 +101,9 @@ public class LinkageDictController extends BaseController
 //    @RequiresPermissions("code:linkage:add")
     @PostMapping("/add")
     @ResponseBody
-    public ZDResponse addSave(LinkageDict linkageDict)
+    public AjaxResult addSave(LinkageDict linkageDict)
     {
-        return linkageDictService.insertLinkageDict(linkageDict) > 0 ? ZDResponse.success("操作成功") : ZDResponse.error("操作失败");
+        return toAjax(linkageDictService.insertLinkageDict(linkageDict));
     }
 
     /**
@@ -126,20 +127,20 @@ public class LinkageDictController extends BaseController
 //    @RequiresPermissions("code:linkage:edit")
     @PostMapping("/edit")
     @ResponseBody
-    public ZDResponse editSave(LinkageDict linkageDict)
+    public AjaxResult editSave(LinkageDict linkageDict)
     {
-        return linkageDictService.updateLinkageDict(linkageDict) > 0 ? ZDResponse.success("操作成功") : ZDResponse.error("操作失败");
+        return toAjax(linkageDictService.updateLinkageDict(linkageDict));
     }
 
     /**
      * 删除联动字典
      */
 //    @RequiresPermissions("code:linkage:remove")
-    @PostMapping( "/remove")
+    @GetMapping( "/remove/{id}")
     @ResponseBody
-    public ZDResponse remove(String ids)
+    public AjaxResult remove(@PathVariable("id") String id)
     {
-        return linkageDictService.deleteLinkageDictByIds(ids) > 0 ? ZDResponse.success("操作成功") : ZDResponse.error("操作失败");
+        return toAjax(linkageDictService.deleteLinkageDictByIds(id));
     }
 
     /**

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/LinkageDictMapper.xml

@@ -38,9 +38,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="status != null "> and status = #{status}</if>
             <if test="creator != null  and creator != ''"> and creator = #{creator}</if>
             <if test="updator != null  and updator != ''"> and updator = #{updator}</if>
-            <!-- 数据范围过滤 -->
-            ${params.dataScope}
-            or (`value` = 100 or `value` = 'law_item' or `value` = 'check_item')
         </where>
     </select>
     
@@ -54,8 +51,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectLinkageDictByValueAndParentId" parameterType="String" resultMap="LinkageDictResult">
         <include refid="selectLinkageDictVo"/>
         where `value` = #{value} and parent_id = #{parentId}
-        <!-- 数据范围过滤 -->
-        ${params.dataScope}
     </select>
         
     <insert id="insertLinkageDict" parameterType="LinkageDict">