Merge remote-tracking branch 'origin/master'

ruoyi-admin/src/main/java/com/ruoyi/busi/service/impl/BusiNoticeServiceImpl.java

@@ -565,9 +565,11 @@ public class BusiNoticeServiceImpl extends ServiceImpl<BusiNoticeMapper,BusiNoti
 
     @Override
     public IPage<BusiNoticeVo> myPublishNoticeList(AppNoticeQuery query, Page<BusiNotice> page) {
+        if (query.getUserId() == null) {
             //获取当前登录用户
             Long userId = SecurityUtils.getUserId();
             query.setUserId(userId);
+        }
         IPage<BusiNoticeVo> pageList = baseMapper.myPublishNoticeList(query, page);
         List<String> idList = pageList.getRecords().stream().map(BusiNotice::getId).collect(Collectors.toList());
         if(!idList.isEmpty()){

ruoyi-admin/src/main/java/com/ruoyi/member/controller/MemberBlacklistController.java

@@ -30,8 +30,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
  */
 @RestController
 @RequestMapping("/member/blacklist")
-public class MemberBlacklistController extends BaseController
+public class MemberBlacklistController extends BaseController {
-{
     @Autowired
     private IMemberBlacklistService memberBlacklistService;
 
@@ -61,8 +60,7 @@ public class MemberBlacklistController extends BaseController
     @PreAuthorize("@ss.hasPermi('member:blacklist:export')")
     @Log(title = "黑名单", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, MemberBlacklist memberBlacklist)
+    public void export(HttpServletResponse response, MemberBlacklist memberBlacklist) {
-    {
         List<MemberBlacklist> list = memberBlacklistService.list();
         ExcelUtil<MemberBlacklist> util = new ExcelUtil<MemberBlacklist>(MemberBlacklist.class);
         util.exportExcel(response, list, "黑名单数据");
@@ -73,8 +71,7 @@ public class MemberBlacklistController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('member:blacklist:query')")
     @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") String id)
+    public AjaxResult getInfo(@PathVariable("id") String id) {
-    {
         return success(memberBlacklistService.getById(id));
     }
 
@@ -84,8 +81,7 @@ public class MemberBlacklistController extends BaseController
     @PreAuthorize("@ss.hasPermi('member:blacklist:add')")
     @Log(title = "黑名单", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody MemberBlacklist memberBlacklist)
+    public AjaxResult add(@RequestBody MemberBlacklist memberBlacklist) {
-    {
         return toAjax(memberBlacklistService.save(memberBlacklist));
     }
 
@@ -95,20 +91,22 @@ public class MemberBlacklistController extends BaseController
     @PreAuthorize("@ss.hasPermi('member:blacklist:edit')")
     @Log(title = "黑名单", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@RequestBody MemberBlacklist memberBlacklist)
+    public AjaxResult edit(@RequestBody MemberBlacklist memberBlacklist) {
-    {
         return toAjax(memberBlacklistService.updateById(memberBlacklist));
     }
 
     /**
-     * 删除黑名单
+     * 移除黑名单
-     */
+     *
-    @PreAuthorize("@ss.hasPermi('member:blacklist:remove')")
+     * @param id id
+     * @return com.ruoyi.common.core.domain.AjaxResult
+     * @author PQZ
+     * @date 11:04 2025/4/15
+     **/
     @Log(title = "黑名单", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
+    @DeleteMapping("/removeById")
-    public AjaxResult remove(@PathVariable String[] ids)
+    public AjaxResult remove(@RequestParam("id") String id) {
-    {
+        memberBlacklistService.removeById(id);
-        List<String> list = new ArrayList<>(Arrays.asList(ids));
+        return success();
-        return toAjax(memberBlacklistService.removeByIds(list));
     }
 }

ruoyi-admin/src/main/java/com/ruoyi/member/vo/MemberUserVO.java

@@ -42,4 +42,6 @@ public class MemberUserVO extends MemberUser {
     int coupon;
     /**用户名*/
     String userName;
+    /**类型名称*/
+    String identityName;
 }

ruoyi-admin/src/main/resources/mapper/member/MemberUserMapper.xml

@@ -88,6 +88,7 @@
         select main.id AS id,
         main.user_type AS userType,
         main.identity_type AS identityType,
+        sdd.dict_label AS identityName,
         main.user_id AS userId,
         main.tel AS tel,
         main.tremaining AS tremaining,
@@ -105,6 +106,7 @@
         GROUP_CONCAT(mc.card_name SEPARATOR ', ') AS memberCardName
         from dl_member_user main
         LEFT JOIN sys_user su ON main.user_id = su.user_id AND su.del_flag = 0
+            left join (select dict_value,dict_label from sys_dict_data where dict_type = 'dl_identity_type') sdd on main.identity_type = sdd.dict_value
         LEFT JOIN dl_member_card mc ON
             main.user_id = mc.user_id
                 AND mc.start_date <= CURDATE()