1.增加orgCode 数据过滤使用

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/DynamicFormColumnDto.java

 package com.yeejoin.amos.boot.module.common.api.dto;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
 import com.alibaba.fastjson.JSONObject;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+
 /**
-* 动态表单树形分组字段表
-*
-* @author system_generator
-* @date 2021-07-06
-*/
+ * 动态表单树形分组字段表
+ *
+ * @author system_generator
+ * @date 2021-07-06
+ */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@ApiModel(value="DynamicFormColumnDto", description="动态表单树形分组字段表")
+@ApiModel(value = "DynamicFormColumnDto", description = "动态表单树形分组字段表")
 public class DynamicFormColumnDto extends BaseDto {
 
     private static final long serialVersionUID = 1L;
 
 
-
     @ApiModelProperty(value = "字段名")
     private String fieldCode;
 
@@ -55,8 +54,10 @@ public class DynamicFormColumnDto  extends BaseDto {
     @ApiModelProperty(value = "提示信息")
     private String remark;
 
-    //新加排序字段
     @ApiModelProperty(value = "排序字段")
     private int sort;
 
+    @ApiModelProperty(value = "组织机构")
+    private String orgCode;
+
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/DynamicFormGroupDto.java

 package com.yeejoin.amos.boot.module.common.api.dto;
 
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 /**
@@ -18,8 +18,6 @@ public class DynamicFormGroupDto  extends BaseDto {
 
    private static final long serialVersionUID = 1L;
 
-
-
     @ApiModelProperty(value = "分组名称")
     private String groupName;
 

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/DynamicFormInstanceDto.java

 package com.yeejoin.amos.boot.module.common.api.dto;
 
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+
 /**
-* 动态表单实例表
-*
-* @author system_generator
-* @date 2021-07-06
-*/
+ * 动态表单实例表
+ *
+ * @author system_generator
+ * @date 2021-07-06
+ */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@ApiModel(value="DynamicFormInstanceDto", description="动态表单实例表")
+@ApiModel(value = "DynamicFormInstanceDto", description = "动态表单实例表")
 public class DynamicFormInstanceDto extends BaseDto {
 
 
-
     private static final long serialVersionUID = 1L;
 
 
-
     @ApiModelProperty(value = "字段名")
     private String fieldCode;
 
@@ -74,11 +71,14 @@ public class DynamicFormInstanceDto  extends BaseDto {
     @ApiModelProperty(value = "配置json")
     private JSONObject columnConfig;
 
-    //新加排序字段
     @ApiModelProperty(value = "排序字段")
     private int sort;
 
-    public DynamicFormInstanceDto() {};
+    @ApiModelProperty(value = "组织机构")
+    private String orgCode;
+
+    public DynamicFormInstanceDto() {
+    }
 
     public DynamicFormInstanceDto(Long sequenceNbr, String fieldName, String fieldCode, Boolean block,
                                   String groupCode) {

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/entity/DynamicFormColumn.java

@@ -8,16 +8,17 @@ import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+
 /**
-* 动态表单树形分组字段表
-*
-* @author system_generator
-* @date 2021-07-06
-*/
+ * 动态表单树形分组字段表
+ *
+ * @author system_generator
+ * @date 2021-07-06
+ */
 @Data
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
-@TableName(value="cb_dynamic_form_column", autoResultMap = true)
+@TableName(value = "cb_dynamic_form_column", autoResultMap = true)
 public class DynamicFormColumn extends BaseEntity {
 
     private static final long serialVersionUID = 1L;
@@ -84,4 +85,10 @@ public class DynamicFormColumn extends BaseEntity {
      */
     @TableField("sort")
     private int sort;
+
+    /**
+     * 组织机构
+     */
+    @TableField("org_code")
+    private String orgCode;
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/entity/DynamicFormGroup.java

@@ -6,12 +6,13 @@ import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+
 /**
-* 动态表单分组表(支持树形)
-*
-* @author system_generator
-* @date 2021-07-06
-*/
+ * 动态表单分组表(支持树形)
+ *
+ * @author system_generator
+ * @date 2021-07-06
+ */
 @Data
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/entity/DynamicFormInstance.java

@@ -8,16 +8,17 @@ import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+
 /**
-* 动态表单实例表
-*
-* @author system_generator
-* @date 2021-07-06
-*/
+ * 动态表单实例表
+ *
+ * @author system_generator
+ * @date 2021-07-06
+ */
 @Data
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
-@TableName(value="cb_dynamic_form_instance", autoResultMap = true)
+@TableName(value = "cb_dynamic_form_instance", autoResultMap = true)
 public class DynamicFormInstance extends BaseEntity {
 
     private static final long serialVersionUID = 1L;
@@ -99,10 +100,18 @@ public class DynamicFormInstance extends BaseEntity {
     @TableField(value = "column_Config", typeHandler = JacksonTypeHandler.class)
     private JSONObject columnConfig;
 
-    //新加排序字段
+    /**
+     * 排序字段
+     */
     @TableField("sort")
     private int sort;
 
+    /**
+     * 组织机构
+     */
+    @TableField("org_code")
+    private String orgCode;
+
 
     public DynamicFormInstance() {
         super();

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/DutyCarController.java

@@ -14,7 +14,6 @@ import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
-import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.text.ParseException;
 import java.util.List;
@@ -125,6 +124,7 @@ public class DutyCarController extends BaseController {
 
     /**
      * 值班数据删除
+     *
      * @param instanceId 实例id
      * @return ResponseModel
      */

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/DutyShiftController.java

 package com.yeejoin.amos.boot.module.common.biz.controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.Api;
-import org.springframework.web.bind.annotation.RestController;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
-import java.util.List;
+import com.yeejoin.amos.boot.module.common.api.dto.DutyShiftDto;
 import com.yeejoin.amos.boot.module.common.biz.service.impl.DutyShiftServiceImpl;
-import org.typroject.tyboot.core.restful.utils.ResponseHelper;
-import org.typroject.tyboot.core.restful.utils.ResponseModel;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import javax.servlet.http.HttpServletRequest;
 import org.springframework.web.bind.annotation.*;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yeejoin.amos.boot.module.common.api.dto.DutyShiftDto;
-import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
 
 
 /**
-* 值班班次
-*
-* @author system_generator
-* @date 2021-07-06
-*/
+ * 值班班次
+ *
+ * @author system_generator
+ * @date 2021-07-06
+ */
 @RestController
 @Api(tags = "值班班次Api")
 @RequestMapping(value = "/common/duty-shift")
@@ -33,76 +33,83 @@ public class DutyShiftController extends BaseController {
 
     /**
      * 新增值班班次
+     *
      * @return
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @PostMapping(value = "/save")
     @ApiOperation(httpMethod = "POST", value = "新增值班班次", notes = "新增值班班次")
-	public ResponseModel<DutyShiftDto> save(@RequestBody DutyShiftDto model)
-	{
-	    model=dutyShiftServiceImpl.createWithModel(model);
+    public ResponseModel<DutyShiftDto> save(@RequestBody DutyShiftDto model) {
+        model = dutyShiftServiceImpl.createWithModel(model);
         return ResponseHelper.buildResponse(model);
     }
+
     /**
      * 根据sequenceNbr更新
+     *
      * @param sequenceNbr 主键
      * @return
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @PutMapping(value = "/{sequenceNbr}")
     @ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新值班班次", notes = "根据sequenceNbr更新值班班次")
-	public ResponseModel<DutyShiftDto> updateBySequenceNbrDutyShift(@RequestBody DutyShiftDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+    public ResponseModel<DutyShiftDto> updateBySequenceNbrDutyShift(@RequestBody DutyShiftDto model, @PathVariable(value = "sequenceNbr") Long sequenceNbr) {
         model.setSequenceNbr(sequenceNbr);
         return ResponseHelper.buildResponse(dutyShiftServiceImpl.updateWithModel(model));
     }
+
     /**
      * 根据sequenceNbr删除
+     *
      * @param sequenceNbr 主键
      * @return
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @DeleteMapping(value = "/{sequenceNbr}")
     @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除值班班次", notes = "根据sequenceNbr删除值班班次")
-    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr){
+    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr) {
         return ResponseHelper.buildResponse(dutyShiftServiceImpl.removeById(sequenceNbr));
     }
+
     /**
      * 根据sequenceNbr查询
+     *
      * @param sequenceNbr 主键
      * @return
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @GetMapping(value = "/{sequenceNbr}")
-	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个值班班次",  notes = "根据sequenceNbr查询单个值班班次")
-	public ResponseModel<DutyShiftDto> seleteOne(@PathVariable Long sequenceNbr)
-	{
+    @ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个值班班次", notes = "根据sequenceNbr查询单个值班班次")
+    public ResponseModel<DutyShiftDto> seleteOne(@PathVariable Long sequenceNbr) {
         return ResponseHelper.buildResponse(dutyShiftServiceImpl.queryBySeq(sequenceNbr));
     }
+
     /**
      * 列表分页查询
-    *@param current 当前页
-    *@param current 每页大小
+     *
+     * @param current 当前页
+     * @param current 每页大小
      * @return
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @GetMapping(value = "/page")
-	@ApiOperation(httpMethod = "GET",value = "值班班次分页查询",  notes = "值班班次分页查询")
-	public ResponseModel<Page<DutyShiftDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam(value = "size") int size)
-	{
-	    Page<DutyShiftDto> page=new Page<DutyShiftDto>();
+    @ApiOperation(httpMethod = "GET", value = "值班班次分页查询", notes = "值班班次分页查询")
+    public ResponseModel<Page<DutyShiftDto>> queryForPage(@RequestParam(value = "current") int current, @RequestParam(value = "size") int size) {
+        Page<DutyShiftDto> page = new Page<DutyShiftDto>();
         page.setCurrent(current);
         page.setSize(size);
         return ResponseHelper.buildResponse(dutyShiftServiceImpl.queryForDutyShiftPage(page));
     }
+
     /**
-	*列表全部数据查询
-	*@return
+     * 列表全部数据查询
+     *
+     * @return
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
-	@ApiOperation(httpMethod = "GET",value = "值班班次列表全部数据查询",   notes = "值班班次列表全部数据查询")
+    @ApiOperation(httpMethod = "GET", value = "值班班次列表全部数据查询", notes = "值班班次列表全部数据查询")
     @GetMapping(value = "/list")
-	public ResponseModel<List<DutyShiftDto>>  selectForList()
-	{
+    public ResponseModel<List<DutyShiftDto>> selectForList() {
         return ResponseHelper.buildResponse(dutyShiftServiceImpl.queryForDutyShiftList());
     }
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/DutyShiftServiceImpl.java

 package com.yeejoin.amos.boot.module.common.biz.service.impl;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.common.api.dto.DutyShiftDto;
 import com.yeejoin.amos.boot.module.common.api.entity.DutyShift;
 import com.yeejoin.amos.boot.module.common.api.mapper.DutyShiftMapper;
 import com.yeejoin.amos.boot.module.common.api.service.IDutyShiftService;
-import com.yeejoin.amos.boot.module.common.api.dto.DutyShiftDto;
-import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+
 import java.util.List;
+
 /**
-* 值班班次服务实现类
-*
-* @author system_generator
-* @date 2021-07-06
-*/
+ * 值班班次服务实现类
+ *
+ * @author system_generator
+ * @date 2021-07-06
+ */
 @Service
-public class DutyShiftServiceImpl extends BaseService<DutyShiftDto,DutyShift,DutyShiftMapper> implements IDutyShiftService {
+public class DutyShiftServiceImpl extends BaseService<DutyShiftDto, DutyShift, DutyShiftMapper> implements IDutyShiftService {
     /**
      * 分页查询
      */
@@ -27,6 +29,6 @@ public class DutyShiftServiceImpl extends BaseService<DutyShiftDto,DutyShift,Dut
      * 列表查询 示例
      */
     public List<DutyShiftDto> queryForDutyShiftList() {
-                return this.queryForList("" , false);
+        return this.queryForList("", false);
     }
 }