wangyizhe/his
3
3
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

提交merge1.3

Browse Source
This commit is contained in:
chenqi
2025-12-27 15:30:25 +08:00
parent 8c607c8749
commit 088861f66e
1245 changed files with 220442 additions and 77616 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
openhis-server-new/core-system/pom.xml
View File

@@ -23,15 +23,24 @@
<groupId>com.core</groupId>
<artifactId>core-common</artifactId>
</dependency>
<<<<<<< HEAD
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
</dependency>
=======
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<optional>true</optional>
</dependency>
>>>>>>> v1.3
<dependency>
<groupId>io.swagger</groupId>
<artifactId>swagger-annotations</artifactId>
<scope>compile</scope>
</dependency>
<!-- postgresql -->

8
openhis-server-new/core-system/src/main/java/com/core/system/service/impl/SysTenantServiceImpl.java
View File

@@ -19,7 +19,7 @@ import com.core.common.core.domain.R;
import com.core.common.core.domain.entity.SysUser;
import com.core.common.core.domain.model.LoginUser;
import com.core.common.core.redis.RedisCache;
import com.core.common.enums.DeleteFlag;
import com.core.common.enums.DelFlag;
import com.core.common.enums.TenantStatus;
import com.core.common.utils.SecurityUtils;
import com.core.common.utils.StringUtils;
@@ -76,7 +76,7 @@ public class SysTenantServiceImpl extends ServiceImpl<SysTenantMapper, SysTenant
lambdaQueryWrapper.eq(SysTenant::getStatus, status);
}
// 未删除
lambdaQueryWrapper.eq(SysTenant::getDeleteFlag, DeleteFlag.NOT_DELETED.getCode());
lambdaQueryWrapper.eq(SysTenant::getDeleteFlag, DelFlag.NO.getCode());
lambdaQueryWrapper.orderByDesc(SysTenant::getId);
return R.ok(baseMapper.selectPage(new Page<>(pageNum, pageSize), lambdaQueryWrapper));
}
@@ -140,7 +140,7 @@ public class SysTenantServiceImpl extends ServiceImpl<SysTenantMapper, SysTenant
return R.fail("该租户还存在绑定的用户，请确认");
}
baseMapper.update(new SysTenant(), new LambdaUpdateWrapper<SysTenant>()
.set(SysTenant::getDeleteFlag, DeleteFlag.DELETED.getCode()).in(SysTenant::getId, tenantIdList));
.set(SysTenant::getDeleteFlag, DelFlag.YES.getCode()).in(SysTenant::getId, tenantIdList));
}
return R.ok();
}
@@ -209,7 +209,7 @@ public class SysTenantServiceImpl extends ServiceImpl<SysTenantMapper, SysTenant
if (StringUtils.isNotEmpty(userName)) {
lambdaQueryWrapper.like(SysUser::getUserName, userName);
}
lambdaQueryWrapper.eq(SysUser::getDeleteFlag, DeleteFlag.NOT_DELETED.getCode());
lambdaQueryWrapper.eq(SysUser::getDeleteFlag, DelFlag.NO.getCode());
lambdaQueryWrapper.orderByDesc(SysUser::getUserId);
return R.ok(sysUserMapper.selectPage(new Page<>(pageNum, pageSize), lambdaQueryWrapper));
}