haonan 1 year ago
parent
commit
bd8a345b91

+ 7 - 7
cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/TenantMemberController.java

@@ -42,7 +42,7 @@ public class TenantMemberController extends BaseController {
     private TenantMemberService tenantMemberService;
 
     @ApiOperation(value = "详情", notes = "机构子账户表-根据详情ID查询单条, 传入id")
-    @PreAuthorize("@auditsvc.hasPermissions('tenantMember/detail', {'BACKEND'})")
+    @PreAuthorize("@pcs.hasPermissions('tenantMember/detail', {'BACKEND'})")
     @PostMapping("/detail/{id}")
     public R<TenantMember> detail(@PathVariable("id") Long id) {
 
@@ -52,7 +52,7 @@ public class TenantMemberController extends BaseController {
     }
 
     @ApiOperation(value = "查询分页", notes = "机构子账户表- 传入 TenantMemberWrapper.TenantMemberQuery")
-    @PreAuthorize("@auditsvc.hasPermissions('tenantMember/page', {'BACKEND'})")
+    @PreAuthorize("@pcs.hasPermissions('tenantMember/page', {'BACKEND'})")
     @PostMapping("/page")
     public HttpResponseResult<PageInfo<TenantMemberWrapper.TenantMember>> page(@RequestBody TenantMemberWrapper.TenantMemberQuery query) {
 
@@ -62,7 +62,7 @@ public class TenantMemberController extends BaseController {
     }
 
     @ApiOperation(value = "新增", notes = "机构子账户表- 传入 TenantMemberWrapper.InsertTenantMember")
-    @PreAuthorize("@auditsvc.hasPermissions('tenantMember/add', {'BACKEND'})")
+    @PreAuthorize("@pcs.hasPermissions('tenantMember/add', {'BACKEND'})")
     @PostMapping("/add")
     public HttpResponseResult add(@RequestBody TenantMemberWrapper.InsertOrUpdateTenantMember tenantMember) {
 
@@ -71,7 +71,7 @@ public class TenantMemberController extends BaseController {
     }
 
     @ApiOperation(value = "修改", notes = "机构子账户表- 传入 TenantMemberWrapper.InsertTenantMember")
-    @PreAuthorize("@auditsvc.hasPermissions('tenantMember/update', {'BACKEND'})")
+    @PreAuthorize("@pcs.hasPermissions('tenantMember/update', {'BACKEND'})")
     @PostMapping("/update")
     public HttpResponseResult update(@RequestBody TenantMemberWrapper.InsertOrUpdateTenantMember tenantMember) {
 
@@ -81,7 +81,7 @@ public class TenantMemberController extends BaseController {
 
 
     @ApiOperation(value = "修改结算账户", notes = "机构子账户表- 传入 TenantMemberWrapper.UpdateCount")
-    @PreAuthorize("@auditsvc.hasPermissions('tenantMember/updateCount', {'BACKEND'})")
+    @PreAuthorize("@pcs.hasPermissions('tenantMember/updateCount', {'BACKEND'})")
     @PostMapping("/updateCount")
     public HttpResponseResult updateCount(@RequestBody TenantMemberWrapper.UpdateCount tenantMember) {
 
@@ -91,7 +91,7 @@ public class TenantMemberController extends BaseController {
 
 
     @ApiOperation(value = "删除", notes = "机构子账户表- 传入id")
-    @PreAuthorize("@auditsvc.hasPermissions('tenantMember/remove', {'BACKEND'})")
+    @PreAuthorize("@pcs.hasPermissions('tenantMember/remove', {'BACKEND'})")
     @PostMapping("/remove")
     public R<Boolean> remove(@RequestParam Long id) {
 
@@ -100,7 +100,7 @@ public class TenantMemberController extends BaseController {
 
 
     @ApiOperation(value = "新增易宝账号", notes = "机构子账户表- 传入 TenantMemberWrapper.AddYBCount")
-    @PreAuthorize("@auditsvc.hasPermissions('tenantMember/addYB', {'BACKEND'})")
+    @PreAuthorize("@pcs.hasPermissions('tenantMember/addYB', {'BACKEND'})")
     @PostMapping("/addYB")
     public HttpResponseResult addYB(@RequestBody TenantMemberWrapper.AddYBCount tenantMember) {
 

+ 3 - 1
cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/TenantMemberServiceImpl.java

@@ -137,10 +137,12 @@ public class TenantMemberServiceImpl extends ServiceImpl<TenantMemberMapper, Ten
     public Boolean updateCount(TenantMemberWrapper.UpdateCount tenantMember) {
 
         if (!StringUtil.isEmpty(tenantMember)){
-            this.lambdaUpdate()
+            LambdaUpdateChainWrapper<TenantMember> wrapper = this.lambdaUpdate()
                     .set(TenantMember::getCardNo, tenantMember.getCardNo())
                     .set(TenantMember::getBankCode, tenantMember.getBankCode())
                     .eq(TenantMember::getId, tenantMember.getId());
+
+            wrapper.update();
             return true;
         }
          return false;

+ 8 - 0
cooleshow-user/user-biz/src/main/resources/config/mybatis/TenantMemberMapper.xml

@@ -46,6 +46,14 @@
         SELECT
         <include refid="baseColumns" />
         FROM tenant_member t
+        <where>
+            <if test="param.memberId != null and param.memberId != ''">
+                and t.member_id_ = #{param.memberId}
+            </if>
+            <if test="param.name != null and param.name != ''">
+                and t.name_ = #{param.name}
+            </if>
+        </where>
     </select>
 
 </mapper>