Merge branch 'develop_3' into 'develop_master'

Develop 3

See merge request LiuChao/foton-slrs-system-rest!381

adc-da-slrs/src/main/java/com/adc/da/slrs/customWorkGroup/controller/WorkGroupController.java

@@ -57,7 +57,7 @@ public class WorkGroupController extends BaseController<WorkGroup> {
 
 
 
-    @ApiModelProperty("删除工作组")
+    @ApiModelProperty("批量删除工作组")
     @DeleteMapping
     public ResponseMessage deleteWorkGroup(String id){
         boolean delete = iWorkGroupService.delete(id);

adc-da-slrs/src/main/java/com/adc/da/slrs/customWorkGroup/service/impl/WorkGroupServiceImpl.java

@@ -12,6 +12,9 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Arrays;
+import java.util.List;
+
 /**
  * <p>
  *  服务实现类
@@ -36,7 +39,8 @@ public class WorkGroupServiceImpl extends ServiceImpl<WorkGroupDao, WorkGroup> i
 
     @Override
     public boolean delete(String workGroupId) {
-        return this.removeById(workGroupId);
+        List<String> idList = Arrays.asList(workGroupId.split(","));
+        return this.removeByIds(idList);
     }
 
     @Override

adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/entity/SarBussionessStand.java

@@ -153,6 +153,9 @@ public class SarBussionessStand extends BaseEntity {
     @TableField(exist = false)
     private String menuParentId;
 
+    @TableField(exist = false)
+    private String textStatusBussShow;
+
     @TableField(exist = false)
     private String standStatusShow; // 标准状态下拉框   --单选