Merge remote-tracking branch 'origin/master'

feige

2025-06-23 8d0db2a5b91a38960855ab3f5ee3e92fe363e8e2

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfShareDataController.java

@@ -3,7 +3,9 @@
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.domain.ZInfoUser;
import com.ruoyi.domain.ZfShareOther;
import com.ruoyi.domain.ZfShareData;
@@ -37,7 +39,12 @@
     */
    @GetMapping("/all")
    public List<ZfShareOther> listAll(ZfShareData zfShareData) {
        List<ZfShareData> zfShareData2 = zfShareDataService.selectList();
        SysUser user = SecurityUtils.getLoginUser().getUser();
        Long userId = user.getUserId();

        zfShareData.setUserId(userId.intValue());

        List<ZfShareData> zfShareData2 = zfShareDataService.selectList(zfShareData);
        List<ZfShareOther> zfShareOtherList = new ArrayList<>();
        for (ZfShareData zfShareData1 :zfShareData2){
            System.out.println("1111111111111111111111");