Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

yusijie

2024-01-23 2095d4d4920f16a8b493c80bada80db5cedc8c31

 WebAPI/Controllers/工资管理/Gy_ClassTimePrjController.cs

@@ -374,6 +374,7 @@
                oClassTimePrj.oModel.HRemark = list[0].HRemark;
                oClassTimePrj.oModel.HMakeEmp = HMaker;
                oClassTimePrj.oModel.HModifyEmp = HMaker;
                oClassTimePrj.oModel.HCheckEmp = list[0].HCheckEmp;
                oClassTimePrj.oModel.HUSEORGID = list[0].HUSEORGID;
                oClassTimePrj.oModel.HCREATEORGID = list[0].HUSEORGID;
                //
@@ -423,6 +424,14 @@
                }
                else
                {
                    if(oClassTimePrj.oModel.HCheckEmp!="")
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "鍗曟嵁宸插鏍革紝涓嶅厑璁镐慨鏀癸紒";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                    //淇敼
                    if (oClassTimePrj.ModifyByID(oClassTimePrj.oModel.HItemID))
                    {
@@ -441,10 +450,6 @@
                        return objJsonResult;
                    }
                }




            }
            catch (Exception e)
            {