11

db/800pjcloudx_wallet.sql

@@ -61,6 +61,27 @@ CREATE TABLE mch_manage
   COLLATE = utf8mb4_general_ci COMMENT ='商户管理';
 CREATE INDEX idx_dept_id ON mch_manage (dept_id);
 
+-- ----------------------------
+-- Table structure for mch_dpet_user
+-- ----------------------------
+DROP TABLE IF EXISTS `mch_dept_user`;
+CREATE TABLE mch_dept_user
+(
+    id           bigint NOT NULL COMMENT '主键',
+    mch_id       bigint NOT NULL COMMENT '商户id',
+    user_id      bigint NOT NULL COMMENT '用户id',
+    user_dept_id bigint NOT NULL COMMENT '用户部门id',
+    create_by    varchar(64) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人',
+    create_time  datetime                               DEFAULT NULL COMMENT '创建时间',
+    update_by    varchar(64) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '修改人',
+    update_time  datetime                               DEFAULT NULL COMMENT '修改时间',
+    del_flag     char(1) COLLATE utf8mb4_general_ci     DEFAULT '0' COMMENT '删除标记',
+    tenant_id    bigint                                 DEFAULT NULL COMMENT '租户ID',
+    PRIMARY KEY (id)
+) ENGINE = InnoDB
+  DEFAULT CHARSET = utf8mb4
+  COLLATE = utf8mb4_general_ci COMMENT ='用户部门商户关系表';
+
 -- ----------------------------
 -- Table structure for wallet_manage
 -- ----------------------------

pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/MchManageController.java

@@ -61,7 +61,7 @@ public class MchManageController {
 
     @Inner
     @GetMapping("/get-by-dept-id")
-    public R<MchManageVo> getByDeptId(@RequestParam("deptId") Long deptId,  MerchantTypeEnum type) {
+    public R<MchManageVo> getByDeptId(@RequestParam("deptId") Long deptId, MerchantTypeEnum type) {
         MchManageVo mchManage = mchManageService.getByDeptId(deptId, type);
         if (ObjectUtil.isEmpty(mchManage)) return R.failed("商户不存在");
         return R.ok(mchManage);