Merge branch 'master' of http://git.dongkesoft.com:9001/iBOSS-2.0-Mini/iboss-server-mdm

src/main/java/com/dk/mdm/model/pojo/mst/SettingValue.java

@@ -40,7 +40,6 @@ public class SettingValue extends PageInfo<SettingValue> implements Serializable
     /**
      * 企业ID
      */
-    @TableId(value = "cp_id", type = IdType.AUTO)
     @ApiModelProperty(value = "企业ID")
     private Integer cpId;
 

src/main/java/com/dk/mdm/model/vo/mst/SettingValueVO.java

@@ -44,7 +44,6 @@ public class SettingValueVO extends PageInfo<SettingValueVO> implements Serializ
     /**
      * 企业ID
      */
-    @TableId(value = "cp_id", type = IdType.AUTO)
     @ApiModelProperty(value = "企业ID")
     private Integer cpId;
 

src/main/java/com/dk/mdm/service/mst/SettingValueService.java

@@ -51,7 +51,8 @@ public class SettingValueService extends BaseService<SettingValue> {
     public ResponseResultVO<Boolean> deleteSettingValueId(Integer id) {
         SettingValue settingValue = new SettingValue();
         settingValue.setCpId(id);
-        return ResponseResultUtil.success(settingValueMapper.deleteSettingValueId(settingValue) > 0);
+        settingValueMapper.deleteSettingValueId(settingValue);
+        return ResponseResultUtil.success() ;
     }
 
     /**
@@ -63,12 +64,9 @@ public class SettingValueService extends BaseService<SettingValue> {
             rollbackFor = {Exception.class}
     )
     public ResponseResultVO<Boolean> updateBatch(SettingValueVO vo) {
-        if (vo.getSettingValueList() != null) {
-            //删除历史功能权限
-            deleteSettingValueId(vo.getCpId());
-        }
+        //删除历史功能权限
+        deleteSettingValueId(vo.getCpId());
         if (vo.getSettingValueList() != null && vo.getSettingValueList().size() > 0) {
-
             //批量新建
             settingValueMapper.insertBatch(vo.getSettingValueList());
         }