Merge remote-tracking branch 'origin/HQPT_USER' into HQPT_USER

@@ -6,6 +6,7 @@ import com.tianbo.warehouse.controller.response.ResultJson;
 import com.tianbo.warehouse.model.PERMISSION;
 import com.tianbo.warehouse.model.PERMISSION;
 import com.tianbo.warehouse.service.PermissionService;
 import com.tianbo.warehouse.service.PermissionService;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;
 
 
@@ -66,7 +67,8 @@ public class PermssionController {
     @DeleteMapping("/del")
     @DeleteMapping("/del")
     public ResultJson reomve(@RequestBody PERMISSION permission, HttpServletRequest request, HttpServletResponse response){
     public ResultJson reomve(@RequestBody PERMISSION permission, HttpServletRequest request, HttpServletResponse response){
 
 
-        int i =permissionService.deleteByPrimaryKey(permission.getPermissionId().toString());
+        Integer permissionId = permission.getPermissionId();
+        int i =permissionService.deleteByPrimaryKey(permission.getPermissionId());
 
 
         ResultJson resultJson = new ResultJson();
         ResultJson resultJson = new ResultJson();
         if (1==i){
         if (1==i){
@@ -78,15 +80,15 @@ public class PermssionController {
     }
     }
 
 
     @LogAnnotation(moduleName = "权限管理",operate = "权限批量删除")
     @LogAnnotation(moduleName = "权限管理",operate = "权限批量删除")
-    @GetMapping("/batchremove")
-    public ResultJson reomve(String ids, HttpServletRequest request, HttpServletResponse response){
+    @PostMapping("/batchremove")
+    public ResultJson reomve(@RequestBody List<Integer> ids, HttpServletRequest request, HttpServletResponse response){
 
 
         ResultJson resultJson = new ResultJson();
         ResultJson resultJson = new ResultJson();
 
 
-        if (permissionService.deleteByPrimaryKey(ids)>0){
+        if (permissionService.deleteByPrimaryKeys(ids)>0){
             resultJson = new ResultJson("200","删除成功");
             resultJson = new ResultJson("200","删除成功");
         }else {
         }else {
-            resultJson = new ResultJson("500","insert faild");
+            resultJson = new ResultJson("400","删除失败");
         }
         }
         return resultJson;
         return resultJson;
     }
     }

@@ -8,6 +8,8 @@ import java.util.List;
 public interface PERMISSIONMapper {
 public interface PERMISSIONMapper {
     int deleteByPrimaryKey(Integer permissionId);
     int deleteByPrimaryKey(Integer permissionId);
 
 
+    int deleteByPrimaryKeys(List<Integer> permissionIds);
+
     int insert(PERMISSION record);
     int insert(PERMISSION record);
 
 
     int insertSelective(PERMISSION record);
     int insertSelective(PERMISSION record);

@@ -26,7 +26,9 @@ public interface PermissionService {
 
 
     int updateByPrimaryKeySelective(PERMISSION permission);
     int updateByPrimaryKeySelective(PERMISSION permission);
 
 
-    int deleteByPrimaryKey(String companyId);
+    int deleteByPrimaryKey(Integer companyId);
+
+    int deleteByPrimaryKeys(List<Integer> companyId);
 
 
     /**
     /**
      * 登录验证成功后获取用户权限列表非树形结构
      * 登录验证成功后获取用户权限列表非树形结构

@@ -168,6 +168,16 @@ public class PermissionServiceImp implements PermissionService {
         return permissionMapper.updateByPrimaryKeySelective(permission);
         return permissionMapper.updateByPrimaryKeySelective(permission);
     }
     }
 
 
+    /** 权限删除
+     *
+     * @param permissionId
+     * @return
+     */
+    @RedisCacheDelTarget(cacheKey = "com.tianbo.warehouse.service.imp.PermissionServiceImp")
+    @Override
+    public int deleteByPrimaryKey(Integer permissionId) {
+            return permissionMapper.deleteByPrimaryKey(permissionId);
+    }
     /** 批量删除
     /** 批量删除
      *
      *
      * @param permissionId
      * @param permissionId
@@ -175,22 +185,8 @@ public class PermissionServiceImp implements PermissionService {
      */
      */
     @RedisCacheDelTarget(cacheKey = "com.tianbo.warehouse.service.imp.PermissionServiceImp")
     @RedisCacheDelTarget(cacheKey = "com.tianbo.warehouse.service.imp.PermissionServiceImp")
     @Override
     @Override
-    public int deleteByPrimaryKey(String permissionId) {
-        if (permissionId.contains(",")) {
-            try {
-                String[] split = permissionId.split(",");
-                for (int i = 0; i < split.length; i++) {
-                    permissionMapper.deleteByPrimaryKey(Integer.valueOf(split[i]));
-                }
-                System.out.println();
-                return 1;
-            } catch (Exception e) {
-                e.printStackTrace();
-                return 0;
-            }
-        } else {
-            return permissionMapper.deleteByPrimaryKey(Integer.valueOf(permissionId));
-        }
+    public int deleteByPrimaryKeys(List<Integer> permissionIds) {
+        return permissionMapper.deleteByPrimaryKeys(permissionIds);
     }
     }
 
 
     @RedisCacheDelTarget(cacheKey = "com.tianbo.warehouse.service.imp.PermissionServiceImp")
     @RedisCacheDelTarget(cacheKey = "com.tianbo.warehouse.service.imp.PermissionServiceImp")

@@ -180,6 +180,15 @@ where P.url = #{permissionUrl,jdbcType=VARCHAR} ORDER BY permission_order
     delete from permission
     delete from permission
     where permission_id = #{permissionId,jdbcType=INTEGER}
     where permission_id = #{permissionId,jdbcType=INTEGER}
   </delete>
   </delete>
+  <delete id="deleteByPrimaryKeys" parameterType="list" >
+    delete from permission
+    <where>
+      permission_id
+      <foreach collection="permissionIds" item="id" separator="," open="in (" close=")">
+        #{id}
+      </foreach>
+    </where>
+  </delete>
   <insert id="insert" parameterType="com.tianbo.warehouse.model.PERMISSION" >
   <insert id="insert" parameterType="com.tianbo.warehouse.model.PERMISSION" >
     insert into permission (permission_id, name, permission_order,
     insert into permission (permission_id, name, permission_order,
       description, ismenu,hidden, parent_id,
       description, ismenu,hidden, parent_id,