xiaju
/
SGGL_JT
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: xiaju:988fe2b2ef25bd72c90f11a51c91a60c532c7666
Branches Tags
xiaju:master
...
compare: xiaju:a557ecdce622b2580890e6c56cbf0c3595058006
Branches Tags
xiaju:master

2 Commits
988fe2b2ef ... a557ecdce6

Author SHA1 Message Date
夏菊 a557ecdce6 Merge branch 'master' of http://47.104.102.122:3000/xiaju/SGGL_JT 2025-04-28 09:11:39 +08:00
夏菊 d4bc59a9f1 1 2025-04-22 20:42:21 +08:00
2 changed files with 2 additions and 2 deletions
Show Stats Expand all files Collapse all files

2
SUBQHSE/BLL/ZHGL/DataSync/MainSevice.cs
View File

@ -22,7 +22,7 @@ namespace BLL
{
var userModel = UserService.GetUserByUserId(userid);
int unitType = CommonService.GetUnitTypeByUserId(userid);
var projectList = ProjectService.GetProjectWorkList().Select(x => new { x.ProjectId, x.UnitId }).ToList();
var projectList = ProjectService.GetProjectWorkList().Where(x => (x.ProjectAttribute == "GONGCHENG" || x.ProjectAttribute == null)).Select(x => new { x.ProjectId, x.UnitId }).ToList();
_unitId = userModel.UnitId;
_unitType = unitType;
if (unitType == 0)

2
SUBQHSE/FineUIPro.Web/FineUIPro.Web.csproj
View File

@ -10490,7 +10490,7 @@
</Compile>
<Compile Include="HJGL\TrustManage\Fastreport.aspx.cs">
<DependentUpon>Fastreport.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
<SubType>Component</SubType>
</Compile>
<Compile Include="HJGL\TrustManage\Fastreport.aspx.designer.cs">
<DependentUpon>Fastreport.aspx</DependentUpon>