From 5a003b84bfc0ac921fd4dc22edfb7eeab627cb76 Mon Sep 17 00:00:00 2001 From: baize <3533151373@qq.com> Date: Wed, 12 Jun 2024 22:32:22 +0800 Subject: [PATCH] =?UTF-8?q?feat():=E4=BF=AE=E6=94=B9=E5=A4=9A=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=BA=90=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/muyu/saas/datasource/ManyDataSource.java | 8 ++++---- .../net/working/controller/EnterpriseController.java | 9 ++++++--- .../src/main/resources/mapper/system/SysUserMapper.xml | 1 - 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/muyu-common/muyu-common-saas/src/main/java/com/muyu/saas/datasource/ManyDataSource.java b/muyu-common/muyu-common-saas/src/main/java/com/muyu/saas/datasource/ManyDataSource.java index 5a8d17f..480ee73 100644 --- a/muyu-common/muyu-common-saas/src/main/java/com/muyu/saas/datasource/ManyDataSource.java +++ b/muyu-common/muyu-common-saas/src/main/java/com/muyu/saas/datasource/ManyDataSource.java @@ -39,9 +39,9 @@ public class ManyDataSource { DruidDataSourceFactory druidDataSourceFactory= SpringUtils.getBean(DruidDataSourceFactory.class); DynamicDataSource dynamicDataSource= SpringUtils.getBean(DynamicDataSource.class); EnterPriseInfo enterPriseInfo = EnterPriseInfo.builder() - .entCode("liu_0605") + .entCode("liu_42") .ip("192.168.116.129") - .port(3309) + .port(3348) .build(); DataSourceInfo dataSourceInfo = DataSourceInfo.hostAndPortBuild(enterPriseInfo.getEntCode(), enterPriseInfo.getIp(), enterPriseInfo.getPort()); @@ -55,9 +55,9 @@ public class ManyDataSource { List list = new ArrayList<>(); list.add( EnterPriseInfo.builder() - .entCode("liu_0608") + .entCode("liu_44") .ip("192.168.116.129") - .port(3310) + .port(3350) .build() ); return list; diff --git a/muyu-modules/muyu-net-working/muyu-net-working-server/src/main/java/com/muyu/net/working/controller/EnterpriseController.java b/muyu-modules/muyu-net-working/muyu-net-working-server/src/main/java/com/muyu/net/working/controller/EnterpriseController.java index 9220ffa..d7c02b8 100644 --- a/muyu-modules/muyu-net-working/muyu-net-working-server/src/main/java/com/muyu/net/working/controller/EnterpriseController.java +++ b/muyu-modules/muyu-net-working/muyu-net-working-server/src/main/java/com/muyu/net/working/controller/EnterpriseController.java @@ -183,6 +183,12 @@ public class EnterpriseController extends BaseController { return toAjax(enterpriseService.removeBatchByIds(ids)); } + /** + * 完善企业信息 + * @param id + * @param enterpriseEditReq + * @return + */ @PostMapping("/updateEnterprise/{id}") public Result updateEnterprise(@PathVariable Integer id, @RequestBody EnterpriseEditReq enterpriseEditReq) { return toAjax(enterpriseService.updateById(Enterprise.editBuild(id,enterpriseEditReq))); @@ -194,9 +200,6 @@ public class EnterpriseController extends BaseController { @PostMapping("/authentication") public Result authentication(@RequestBody Enterprise enterprise ) { enterpriseService.authentication(enterprise); - if(!enterprise.getEnterpriseStatus().equals("Y")){ - return Result.error("已经审核完成"); - } return Result.success(); } } diff --git a/muyu-modules/muyu-system/src/main/resources/mapper/system/SysUserMapper.xml b/muyu-modules/muyu-system/src/main/resources/mapper/system/SysUserMapper.xml index 67d8e3c..6f633b7 100644 --- a/muyu-modules/muyu-system/src/main/resources/mapper/system/SysUserMapper.xml +++ b/muyu-modules/muyu-system/src/main/resources/mapper/system/SysUserMapper.xml @@ -49,7 +49,6 @@ select u.user_id, u.dept_id, - u.type, u.user_name, u.nick_name, u.email,